mirror of https://gitlab.com/qemu-project/qemu
Revert "fdc: fix vmstate variable passed"
Floppy used the io_base address to register savevm region.
This reverts commit 2966b390d0
.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
c62313bbdc
commit
aef30c3c6a
33
hw/fdc.c
33
hw/fdc.c
|
@ -661,7 +661,7 @@ static int fdc_post_load(void *opaque, int version_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const VMStateDescription vmstate_fdc = {
|
static const VMStateDescription vmstate_fdc = {
|
||||||
.name = "fdctrl",
|
.name = "fdc",
|
||||||
.version_id = 2,
|
.version_id = 2,
|
||||||
.minimum_version_id = 2,
|
.minimum_version_id = 2,
|
||||||
.minimum_version_id_old = 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)
|
static void fdctrl_external_reset_sysbus(DeviceState *d)
|
||||||
{
|
{
|
||||||
fdctrl_sysbus_t *sys = container_of(d, fdctrl_sysbus_t, busdev.qdev);
|
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.name = "isa-fdc",
|
||||||
.qdev.size = sizeof(fdctrl_isabus_t),
|
.qdev.size = sizeof(fdctrl_isabus_t),
|
||||||
.qdev.no_user = 1,
|
.qdev.no_user = 1,
|
||||||
.qdev.vmsd = &vmstate_fdc_isa,
|
.qdev.vmsd = &vmstate_fdc,
|
||||||
.qdev.reset = fdctrl_external_reset_isa,
|
.qdev.reset = fdctrl_external_reset_isa,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo),
|
DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo),
|
||||||
|
@ -2042,7 +2017,7 @@ static SysBusDeviceInfo sysbus_fdc_info = {
|
||||||
.init = sysbus_fdc_init1,
|
.init = sysbus_fdc_init1,
|
||||||
.qdev.name = "sysbus-fdc",
|
.qdev.name = "sysbus-fdc",
|
||||||
.qdev.size = sizeof(fdctrl_sysbus_t),
|
.qdev.size = sizeof(fdctrl_sysbus_t),
|
||||||
.qdev.vmsd = &vmstate_fdc_sysbus,
|
.qdev.vmsd = &vmstate_fdc,
|
||||||
.qdev.reset = fdctrl_external_reset_sysbus,
|
.qdev.reset = fdctrl_external_reset_sysbus,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo),
|
DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo),
|
||||||
|
@ -2055,7 +2030,7 @@ static SysBusDeviceInfo sun4m_fdc_info = {
|
||||||
.init = sun4m_fdc_init1,
|
.init = sun4m_fdc_init1,
|
||||||
.qdev.name = "SUNW,fdtwo",
|
.qdev.name = "SUNW,fdtwo",
|
||||||
.qdev.size = sizeof(fdctrl_sysbus_t),
|
.qdev.size = sizeof(fdctrl_sysbus_t),
|
||||||
.qdev.vmsd = &vmstate_fdc_sysbus,
|
.qdev.vmsd = &vmstate_fdc,
|
||||||
.qdev.reset = fdctrl_external_reset_sysbus,
|
.qdev.reset = fdctrl_external_reset_sysbus,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),
|
DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),
|
||||||
|
|
Loading…
Reference in New Issue