From 3243a06f519acf73edeb0505519f429dd4018fdb Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 15 Dec 2009 14:34:34 +0100 Subject: Revert "fdc: fix vmstate variable passed" Floppy used the io_base address to register savevm region. This reverts commit 2966b390d0f7cd5e5b971290fcc20685de374228. Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori (cherry picked from commit aef30c3c6a3165178584eb125f64defd8173eebd) --- hw/fdc.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index e875291a3a..d2bfa71d8f 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); @@ -2023,7 +1998,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), @@ -2036,7 +2011,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), @@ -2049,7 +2024,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), -- cgit v1.2.1