From patchwork Tue Dec 15 13:34:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 41187 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 2010FB6EEE for ; Wed, 16 Dec 2009 00:38:51 +1100 (EST) Received: from localhost ([127.0.0.1]:36231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXc0-0007SR-5e for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2009 08:38:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKXZ1-0005YQ-EV for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKXYw-0005Qq-DS for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:42 -0500 Received: from [199.232.76.173] (port=51844 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXYw-0005QL-0O for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32405) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKXYv-0004na-G4 for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:35:37 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBFDZae3020896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Dec 2009 08:35:36 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBFDZVfJ031630; Tue, 15 Dec 2009 08:35:34 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Dec 2009 14:34:34 +0100 Message-Id: <775c479b7b85e76dc0d24eb9574e4b4f3d8a7ad8.1260883880.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/2] Revert "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 Floppy used the io_base address to register savevm region. This reverts commit 2966b390d0f7cd5e5b971290fcc20685de374228. Signed-off-by: Juan Quintela --- hw/fdc.c | 33 ++++----------------------------- 1 files changed, 4 insertions(+), 29 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 11ea439..1352dc4 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 = "fdctrl", + .name = "fdc", .version_id = 2, .minimum_version_id = 2, .minimum_version_id_old = 2, @@ -699,31 +699,6 @@ 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); @@ -2029,7 +2004,7 @@ static ISADeviceInfo isa_fdc_info = { .qdev.name = "isa-fdc", .qdev.size = sizeof(fdctrl_isabus_t), .qdev.no_user = 1, - .qdev.vmsd = &vmstate_fdc_isa, + .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo), @@ -2042,7 +2017,7 @@ static SysBusDeviceInfo sysbus_fdc_info = { .init = sysbus_fdc_init1, .qdev.name = "sysbus-fdc", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc_sysbus, + .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo), @@ -2055,7 +2030,7 @@ static SysBusDeviceInfo sun4m_fdc_info = { .init = sun4m_fdc_init1, .qdev.name = "SUNW,fdtwo", .qdev.size = sizeof(fdctrl_sysbus_t), - .qdev.vmsd = &vmstate_fdc_sysbus, + .qdev.vmsd = &vmstate_fdc, .qdev.reset = fdctrl_external_reset_sysbus, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),