Revision 2966b390

b/hw/fdc.c
661 661
}
662 662

  
663 663
static const VMStateDescription vmstate_fdc = {
664
    .name = "fdc",
664
    .name = "fdctrl",
665 665
    .version_id = 2,
666 666
    .minimum_version_id = 2,
667 667
    .minimum_version_id_old = 2,
......
699 699
    }
700 700
};
701 701

  
702
static const VMStateDescription vmstate_fdc_isa = {
703
    .name = "fdc",
704
    .version_id = 2,
705
    .minimum_version_id = 2,
706
    .minimum_version_id_old = 2,
707
    .fields      = (VMStateField []) {
708
        /* Controller State */
709
        VMSTATE_STRUCT(state, fdctrl_isabus_t, 0, vmstate_fdc, fdctrl_t),
710
        VMSTATE_END_OF_LIST()
711
    }
712
};
713

  
714
static const VMStateDescription vmstate_fdc_sysbus = {
715
    .name = "fdc",
716
    .version_id = 2,
717
    .minimum_version_id = 2,
718
    .minimum_version_id_old = 2,
719
    .fields      = (VMStateField []) {
720
        /* Controller State */
721
        VMSTATE_STRUCT(state, fdctrl_sysbus_t, 0, vmstate_fdc, fdctrl_t),
722
        VMSTATE_END_OF_LIST()
723
    }
724
};
725

  
726

  
702 727
static void fdctrl_external_reset_sysbus(DeviceState *d)
703 728
{
704 729
    fdctrl_sysbus_t *sys = container_of(d, fdctrl_sysbus_t, busdev.qdev);
......
1998 2023
    .qdev.name  = "isa-fdc",
1999 2024
    .qdev.size  = sizeof(fdctrl_isabus_t),
2000 2025
    .qdev.no_user = 1,
2001
    .qdev.vmsd  = &vmstate_fdc,
2026
    .qdev.vmsd  = &vmstate_fdc_isa,
2002 2027
    .qdev.reset = fdctrl_external_reset_isa,
2003 2028
    .qdev.props = (Property[]) {
2004 2029
        DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].dinfo),
......
2011 2036
    .init = sysbus_fdc_init1,
2012 2037
    .qdev.name  = "sysbus-fdc",
2013 2038
    .qdev.size  = sizeof(fdctrl_sysbus_t),
2014
    .qdev.vmsd  = &vmstate_fdc,
2039
    .qdev.vmsd  = &vmstate_fdc_sysbus,
2015 2040
    .qdev.reset = fdctrl_external_reset_sysbus,
2016 2041
    .qdev.props = (Property[]) {
2017 2042
        DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].dinfo),
......
2024 2049
    .init = sun4m_fdc_init1,
2025 2050
    .qdev.name  = "SUNW,fdtwo",
2026 2051
    .qdev.size  = sizeof(fdctrl_sysbus_t),
2027
    .qdev.vmsd  = &vmstate_fdc,
2052
    .qdev.vmsd  = &vmstate_fdc_sysbus,
2028 2053
    .qdev.reset = fdctrl_external_reset_sysbus,
2029 2054
    .qdev.props = (Property[]) {
2030 2055
        DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinfo),

Also available in: Unified diff