From patchwork Wed Nov 11 22:53:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 38189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 316E5B7B79 for ; Thu, 12 Nov 2009 09:54:10 +1100 (EST) Received: from localhost ([127.0.0.1]:50110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8M4l-0000LM-2j for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2009 17:54:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8M40-0008V3-3U for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8M3v-0008Q4-Ea for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:19 -0500 Received: from [199.232.76.173] (port=58764 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8M3v-0008Pw-Ax for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:15 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:41608) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8M3u-0002wU-N3 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:15 -0500 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate03.web.de (Postfix) with ESMTP id 1683E1321B325; Wed, 11 Nov 2009 23:53:12 +0100 (CET) Received: from [88.64.15.183] (helo=[192.168.1.10]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1N8M3r-0007FP-00; Wed, 11 Nov 2009 23:53:11 +0100 Message-ID: <4AFB4059.8020607@web.de> Date: Wed, 11 Nov 2009 23:53:13 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Blue Swirl X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+CxssrJDtSsTMCmWLQJFXkrGX18LKcixReFK+Z uVqeZw7X7KY/NFlXyal3TpDRELcYQfehkgbmvzNclO+Av6qLWx MWqL+W4E4= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Gerd Hoffmann , qemu-devel , Juan Quintela Subject: [Qemu-devel] [PATCH] fdc: Fix vmsave/restore regression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This partly reverts 2be3783328: First, the conversion neglected to update the opaque translation in fdc_pre_save/fdc_post_load which causes memory corruptions on vmsave/restore. And second, we can't apply a common translation here as DeviceState->fdctrl_t is different for sysbus and ISA. Signed-off-by: Jan Kiszka --- hw/fdc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) *** NOTE *** 'git shortlog|grep "reset + vmsd"' shows 10 such conversions. I only briefly checked the first one, and it looks similar broken. Could someone have a second look at them? Maybe it is also better to define a vmsd opaque in DeviceInfo, which would also allow to solve this issue differently. diff --git a/hw/fdc.c b/hw/fdc.c index d2bfa71..1e1b827 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1932,6 +1932,8 @@ static int fdctrl_init_common(fdctrl_t *fdctrl) DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler, fdctrl); fdctrl_connect_drives(fdctrl); + vmstate_register(-1, &vmstate_fdc, fdctrl); + return 0; } @@ -1998,7 +2000,6 @@ static ISADeviceInfo isa_fdc_info = { .qdev.name = "isa-fdc", .qdev.size = sizeof(fdctrl_isabus_t), .qdev.no_user = 1, - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo), @@ -2011,7 +2012,6 @@ static SysBusDeviceInfo sysbus_fdc_info = { .init = sysbus_fdc_init1, .qdev.name = "sysbus-fdc", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo), @@ -2024,7 +2024,6 @@ static SysBusDeviceInfo sun4m_fdc_info = { .init = sun4m_fdc_init1, .qdev.name = "SUNW,fdtwo", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),