From patchwork Wed Nov 11 23:39:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 38194 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 A26EDB7B6A for ; Thu, 12 Nov 2009 10:42:17 +1100 (EST) Received: from localhost ([127.0.0.1]:58459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8MpK-0005SD-Jl for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2009 18:42:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8Mms-0003fA-IC for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8Mmn-0003bs-Iv for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:41 -0500 Received: from [199.232.76.173] (port=45100 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Mmn-0003bM-9l for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2484) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8Mmm-0001Lr-R6 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:37 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nABNdZTP031715 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 11 Nov 2009 18:39:35 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nABNdUAJ028893; Wed, 11 Nov 2009 18:39:33 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 12 Nov 2009 00:39:12 +0100 Message-Id: <81da0604e85159ff17dfa594f38e835430b5c3f4.1257982286.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, glommer@redhat.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 1/3] fdc: fix vmstate variable passed 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 When code was transformed to use qdev_reset/vmstate registration, vmstate was passed a variable of the wrong type Signed-off-by: Juan Quintela --- hw/fdc.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index d2bfa71..e875291 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -661,7 +661,7 @@ static int fdc_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_fdc = { - .name = "fdc", + .name = "fdctrl", .version_id = 2, .minimum_version_id = 2, .minimum_version_id_old = 2, @@ -699,6 +699,31 @@ static const VMStateDescription vmstate_fdc = { } }; +static const VMStateDescription vmstate_fdc_isa = { + .name = "fdc", + .version_id = 2, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .fields = (VMStateField []) { + /* Controller State */ + VMSTATE_STRUCT(state, fdctrl_isabus_t, 0, vmstate_fdc, fdctrl_t), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_fdc_sysbus = { + .name = "fdc", + .version_id = 2, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .fields = (VMStateField []) { + /* Controller State */ + VMSTATE_STRUCT(state, fdctrl_sysbus_t, 0, vmstate_fdc, fdctrl_t), + VMSTATE_END_OF_LIST() + } +}; + + static void fdctrl_external_reset_sysbus(DeviceState *d) { fdctrl_sysbus_t *sys = container_of(d, fdctrl_sysbus_t, busdev.qdev); @@ -1998,7 +2023,7 @@ static ISADeviceInfo isa_fdc_info = { .qdev.name = "isa-fdc", .qdev.size = sizeof(fdctrl_isabus_t), .qdev.no_user = 1, - .qdev.vmsd = &vmstate_fdc, + .qdev.vmsd = &vmstate_fdc_isa, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo), @@ -2011,7 +2036,7 @@ static SysBusDeviceInfo sysbus_fdc_info = { .init = sysbus_fdc_init1, .qdev.name = "sysbus-fdc", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, + .qdev.vmsd = &vmstate_fdc_sysbus, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo), @@ -2024,7 +2049,7 @@ static SysBusDeviceInfo sun4m_fdc_info = { .init = sun4m_fdc_init1, .qdev.name = "SUNW,fdtwo", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc, + .qdev.vmsd = &vmstate_fdc_sysbus, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),