| Message ID | 1398091304-10677-6-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
Juan Quintela <quintela@redhat.com> wrote: > After previous Peter patch, they are redundant. This way we don't asign them > except when needed. Once there, there were lots of case where the ".fields" > indentation was wrong: > > .fields = (VMStateField []) { > and > .fields = (VMStateField []) { > > Change all the combinations to: > > .fields = (VMStateField[]){ > > The biggest problem (appart of aesthetics) was that checkpatch complained > when we copy&pasted the code from one place to another. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Hi could any of you review this? Changes are trivial. Thanks, Juan. > --- > hw/acpi/ich9.c | 1 - > hw/acpi/pcihp.c | 3 +- > hw/acpi/piix4.c | 8 ++---- > hw/audio/ac97.c | 6 ++-- > hw/audio/cs4231.c | 3 +- > hw/audio/cs4231a.c | 3 +- > hw/audio/es1370.c | 6 ++-- > hw/audio/gus.c | 3 +- > hw/audio/hda-codec.c | 4 +-- > hw/audio/intel-hda.c | 4 +-- > hw/audio/sb16.c | 3 +- > hw/block/fdc.c | 16 ++++------- > hw/char/serial-pci.c | 4 +-- > hw/char/serial.c | 2 +- > hw/display/cirrus_vga.c | 6 ++-- > hw/display/vga-pci.c | 3 +- > hw/display/vga.c | 3 +- > hw/display/vmware_vga.c | 6 ++-- > hw/dma/i8257.c | 6 ++-- > hw/i386/acpi-build.c | 3 +- > hw/i386/kvm/clock.c | 1 - > hw/i386/kvmvapic.c | 3 -- > hw/i386/pc.c | 3 +- > hw/ide/ahci.c | 6 ++-- > hw/ide/ich.c | 2 +- > hw/ide/isa.c | 3 +- > hw/ide/pci.c | 12 +++----- > hw/input/pckbd.c | 6 ++-- > hw/input/ps2.c | 12 +++----- > hw/input/vmmouse.c | 3 +- > hw/intc/i8259_common.c | 1 - > hw/intc/ioapic_common.c | 1 - > hw/isa/apm.c | 1 - > hw/isa/lpc_ich9.c | 1 - > hw/isa/piix4.c | 3 +- > hw/isa/vt82c686.c | 6 ++-- > hw/net/e1000.c | 6 ++-- > hw/net/eepro100.c | 3 +- > hw/net/ne2000-isa.c | 3 +- > hw/net/ne2000.c | 6 ++-- > hw/net/pcnet-pci.c | 3 +- > hw/net/pcnet.c | 3 +- > hw/net/rtl8139.c | 9 ++---- > hw/net/vmxnet3.c | 4 +-- > hw/nvram/eeprom93xx.c | 3 +- > hw/nvram/fw_cfg.c | 3 +- > hw/pci-bridge/ioh3420.c | 1 - > hw/pci-bridge/xio3130_downstream.c | 1 - > hw/pci-bridge/xio3130_upstream.c | 1 - > hw/pci-host/piix.c | 7 ++--- > hw/pci-host/q35.c | 3 +- > hw/pci/pci.c | 9 ++---- > hw/pci/pcie_aer.c | 6 ++-- > hw/scsi/lsi53c895a.c | 3 +- > hw/scsi/megasas.c | 3 +- > hw/scsi/scsi-bus.c | 4 +-- > hw/scsi/scsi-disk.c | 1 - > hw/scsi/vmw_pvscsi.c | 3 +- > hw/timer/hpet.c | 9 ++---- > hw/timer/i8254_common.c | 1 - > hw/timer/mc146818rtc.c | 3 +- > hw/watchdog/wdt_i6300esb.c | 14 +++++----- > hw/watchdog/wdt_ib700.c | 3 +- > hw/xen/xen_platform.c | 3 +- > target-i386/machine.c | 57 +++++++++++++------------------------- > 65 files changed, 113 insertions(+), 219 deletions(-) > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index 0afac42..407ae89 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -143,7 +143,6 @@ const VMStateDescription vmstate_ich9_pm = { > .name = "ich9_pm", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = ich9_pm_post_load, > .fields = (VMStateField[]) { > VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs), > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index f80c480..d807cf1 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -322,8 +322,7 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = { > .name = "acpi_pcihp_pci_status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(up, AcpiPciHpPciStatus), > VMSTATE_UINT32(down, AcpiPciHpPciStatus), > VMSTATE_END_OF_LIST() > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index 67dc075..252bbf2 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -177,8 +177,7 @@ static const VMStateDescription vmstate_gpe = { > .name = "gpe", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_GPE_ARRAY(sts, ACPIGPE), > VMSTATE_GPE_ARRAY(en, ACPIGPE), > VMSTATE_END_OF_LIST() > @@ -189,8 +188,7 @@ static const VMStateDescription vmstate_pci_status = { > .name = "pci_status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(up, struct AcpiPciHpPciStatus), > VMSTATE_UINT32(down, struct AcpiPciHpPciStatus), > VMSTATE_END_OF_LIST() > @@ -259,7 +257,7 @@ static const VMStateDescription vmstate_acpi = { > .minimum_version_id_old = 1, > .load_state_old = acpi_load_old, > .post_load = vmstate_acpi_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), > VMSTATE_UINT16(ar.pm1.evt.sts, PIIX4PMState), > VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), > diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c > index 03f4846..45cb118 100644 > --- a/hw/audio/ac97.c > +++ b/hw/audio/ac97.c > @@ -1163,8 +1163,7 @@ static const VMStateDescription vmstate_ac97_bm_regs = { > .name = "ac97_bm_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (bdbar, AC97BusMasterRegs), > VMSTATE_UINT8 (civ, AC97BusMasterRegs), > VMSTATE_UINT8 (lvi, AC97BusMasterRegs), > @@ -1211,9 +1210,8 @@ static const VMStateDescription vmstate_ac97 = { > .name = "ac97", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ac97_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE (dev, AC97LinkState), > VMSTATE_UINT32 (glob_cnt, AC97LinkState), > VMSTATE_UINT32 (glob_sta, AC97LinkState), > diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c > index d19195a..6325a8c 100644 > --- a/hw/audio/cs4231.c > +++ b/hw/audio/cs4231.c > @@ -137,8 +137,7 @@ static const VMStateDescription vmstate_cs4231 = { > .name ="cs4231", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS), > VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS), > VMSTATE_END_OF_LIST() > diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c > index a0ec17a..f96f561 100644 > --- a/hw/audio/cs4231a.c > +++ b/hw/audio/cs4231a.c > @@ -621,10 +621,9 @@ static const VMStateDescription vmstate_cs4231a = { > .name = "cs4231a", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_load = cs4231a_pre_load, > .post_load = cs4231a_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32_ARRAY (regs, CSState, CS_REGS), > VMSTATE_BUFFER (dregs, CSState), > VMSTATE_INT32 (dma_running, CSState), > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index 1ec7ace..5dbf803 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -953,8 +953,7 @@ static const VMStateDescription vmstate_es1370_channel = { > .name = "es1370_channel", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (shift, struct chan), > VMSTATE_UINT32 (leftover, struct chan), > VMSTATE_UINT32 (scount, struct chan), > @@ -997,9 +996,8 @@ static const VMStateDescription vmstate_es1370 = { > .name = "es1370", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = es1370_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE (dev, ES1370State), > VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2, > vmstate_es1370_channel, struct chan), > diff --git a/hw/audio/gus.c b/hw/audio/gus.c > index e29a571..bba6840 100644 > --- a/hw/audio/gus.c > +++ b/hw/audio/gus.c > @@ -222,8 +222,7 @@ static const VMStateDescription vmstate_gus = { > .name = "gus", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32 (pos, GUSState), > VMSTATE_INT32 (left, GUSState), > VMSTATE_INT32 (shift, GUSState), > diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c > index a67ca91..09559ef 100644 > --- a/hw/audio/hda-codec.c > +++ b/hw/audio/hda-codec.c > @@ -580,7 +580,7 @@ static void hda_audio_reset(DeviceState *dev) > static const VMStateDescription vmstate_hda_audio_stream = { > .name = "hda-audio-stream", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(stream, HDAAudioStream), > VMSTATE_UINT32(channel, HDAAudioStream), > VMSTATE_UINT32(format, HDAAudioStream), > @@ -598,7 +598,7 @@ static const VMStateDescription vmstate_hda_audio = { > .name = "hda-audio", > .version_id = 2, > .post_load = hda_audio_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0, > vmstate_hda_audio_stream, > HDAAudioStream), > diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c > index d41f82c..1c660a4 100644 > --- a/hw/audio/intel-hda.c > +++ b/hw/audio/intel-hda.c > @@ -1175,7 +1175,7 @@ static int intel_hda_post_load(void *opaque, int version) > static const VMStateDescription vmstate_intel_hda_stream = { > .name = "intel-hda-stream", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(ctl, IntelHDAStream), > VMSTATE_UINT32(lpib, IntelHDAStream), > VMSTATE_UINT32(cbl, IntelHDAStream), > @@ -1191,7 +1191,7 @@ static const VMStateDescription vmstate_intel_hda = { > .name = "intel-hda", > .version_id = 1, > .post_load = intel_hda_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(pci, IntelHDAState), > > /* registers */ > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > index bb24e00..60c4b3b 100644 > --- a/hw/audio/sb16.c > +++ b/hw/audio/sb16.c > @@ -1289,9 +1289,8 @@ static const VMStateDescription vmstate_sb16 = { > .name = "sb16", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = sb16_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (irq, SB16State), > VMSTATE_UINT32 (dma, SB16State), > VMSTATE_UINT32 (hdma, SB16State), > diff --git a/hw/block/fdc.c b/hw/block/fdc.c > index 1651007..490d127 100644 > --- a/hw/block/fdc.c > +++ b/hw/block/fdc.c > @@ -672,8 +672,7 @@ static const VMStateDescription vmstate_fdrive_media_changed = { > .name = "fdrive/media_changed", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(media_changed, FDrive), > VMSTATE_END_OF_LIST() > } > @@ -690,8 +689,7 @@ static const VMStateDescription vmstate_fdrive_media_rate = { > .name = "fdrive/media_rate", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(media_rate, FDrive), > VMSTATE_END_OF_LIST() > } > @@ -701,8 +699,7 @@ static const VMStateDescription vmstate_fdrive = { > .name = "fdrive", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(head, FDrive), > VMSTATE_UINT8(track, FDrive), > VMSTATE_UINT8(sect, FDrive), > @@ -741,10 +738,9 @@ static const VMStateDescription vmstate_fdc = { > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .pre_save = fdc_pre_save, > .post_load = fdc_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > /* Controller State */ > VMSTATE_UINT8(sra, FDCtrl), > VMSTATE_UINT8(srb, FDCtrl), > @@ -2209,7 +2205,7 @@ static const VMStateDescription vmstate_isa_fdc ={ > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), > VMSTATE_END_OF_LIST() > } > @@ -2251,7 +2247,7 @@ static const VMStateDescription vmstate_sysbus_fdc ={ > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c > index 991c99f..44f50c3 100644 > --- a/hw/char/serial-pci.c > +++ b/hw/char/serial-pci.c > @@ -155,7 +155,7 @@ static const VMStateDescription vmstate_pci_serial = { > .name = "pci-serial", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCISerialState), > VMSTATE_STRUCT(state, PCISerialState, 0, vmstate_serial, SerialState), > VMSTATE_END_OF_LIST() > @@ -166,7 +166,7 @@ static const VMStateDescription vmstate_pci_multi_serial = { > .name = "pci-serial-multi", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState), > VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS, > 0, vmstate_serial, SerialState), > diff --git a/hw/char/serial.c b/hw/char/serial.c > index f4d167f..d17da16 100644 > --- a/hw/char/serial.c > +++ b/hw/char/serial.c > @@ -602,7 +602,7 @@ const VMStateDescription vmstate_serial = { > .minimum_version_id = 2, > .pre_save = serial_pre_save, > .post_load = serial_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16_V(divider, SerialState, 2), > VMSTATE_UINT8(rbr, SerialState), > VMSTATE_UINT8(ier, SerialState), > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 0d3127d..55449a6 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -2702,9 +2702,8 @@ static const VMStateDescription vmstate_cirrus_vga = { > .name = "cirrus_vga", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = cirrus_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(vga.latch, CirrusVGAState), > VMSTATE_UINT8(vga.sr_index, CirrusVGAState), > VMSTATE_BUFFER(vga.sr, CirrusVGAState), > @@ -2742,8 +2741,7 @@ static const VMStateDescription vmstate_pci_cirrus_vga = { > .name = "cirrus_vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCICirrusVGAState), > VMSTATE_STRUCT(cirrus_vga, PCICirrusVGAState, 0, > vmstate_cirrus_vga, CirrusVGAState), > diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c > index 574ea0e..a2a9ca1 100644 > --- a/hw/display/vga-pci.c > +++ b/hw/display/vga-pci.c > @@ -54,8 +54,7 @@ static const VMStateDescription vmstate_vga_pci = { > .name = "vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCIVGAState), > VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common, VGACommonState), > VMSTATE_END_OF_LIST() > diff --git a/hw/display/vga.c b/hw/display/vga.c > index 063319d..9e35dd2 100644 > --- a/hw/display/vga.c > +++ b/hw/display/vga.c > @@ -2210,9 +2210,8 @@ const VMStateDescription vmstate_vga_common = { > .name = "vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = vga_common_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(latch, VGACommonState), > VMSTATE_UINT8(sr_index, VGACommonState), > VMSTATE_PARTIAL_BUFFER(sr, VGACommonState, 8), > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index 6ae3348..00bb385 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -1152,9 +1152,8 @@ static const VMStateDescription vmstate_vmware_vga_internal = { > .name = "vmware_vga_internal", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = vmsvga_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s), > VMSTATE_INT32(enable, struct vmsvga_state_s), > VMSTATE_INT32(config, struct vmsvga_state_s), > @@ -1179,8 +1178,7 @@ static const VMStateDescription vmstate_vmware_vga = { > .name = "vmware_vga", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, struct pci_vmsvga_state_s), > VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0, > vmstate_vmware_vga_internal, struct vmsvga_state_s), > diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c > index 4490372..dd370ed 100644 > --- a/hw/dma/i8257.c > +++ b/hw/dma/i8257.c > @@ -551,8 +551,7 @@ static const VMStateDescription vmstate_dma_regs = { > .name = "dma_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_ARRAY(now, struct dma_regs, 2), > VMSTATE_UINT16_ARRAY(base, struct dma_regs, 2), > VMSTATE_UINT8(mode, struct dma_regs), > @@ -575,9 +574,8 @@ static const VMStateDescription vmstate_dma = { > .name = "dma", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = dma_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(command, struct dma_cont), > VMSTATE_UINT8(mask, struct dma_cont), > VMSTATE_UINT8(flip_flop, struct dma_cont), > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index c98df88..faf5f4f 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1497,8 +1497,7 @@ static const VMStateDescription vmstate_acpi_build = { > .name = "acpi_build", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(patched, AcpiBuildState), > VMSTATE_END_OF_LIST() > }, > diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c > index 892aa02..07b9c0e 100644 > --- a/hw/i386/kvm/clock.c > +++ b/hw/i386/kvm/clock.c > @@ -102,7 +102,6 @@ static const VMStateDescription kvmclock_vmsd = { > .name = "kvmclock", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT64(clock, KVMClockState), > VMSTATE_END_OF_LIST() > diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c > index a1c3d1c..a730f4b 100644 > --- a/hw/i386/kvmvapic.c > +++ b/hw/i386/kvmvapic.c > @@ -773,7 +773,6 @@ static const VMStateDescription vmstate_handlers = { > .name = "kvmvapic-handlers", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT32(set_tpr, VAPICHandlers), > VMSTATE_UINT32(set_tpr_eax, VAPICHandlers), > @@ -787,7 +786,6 @@ static const VMStateDescription vmstate_guest_rom = { > .name = "kvmvapic-guest-rom", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UNUSED(8), /* signature */ > VMSTATE_UINT32(vaddr, GuestROMState), > @@ -807,7 +805,6 @@ static const VMStateDescription vmstate_vapic = { > .name = "kvm-tpr-opt", /* compatible with qemu-kvm VAPIC */ > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = vapic_post_load, > .fields = (VMStateField[]) { > VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 14f0d91..5155393 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -502,8 +502,7 @@ static const VMStateDescription vmstate_port92_isa = { > .name = "port92", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(outport, Port92State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > index bfe633f..a225181 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -1225,7 +1225,7 @@ void ahci_reset(AHCIState *s) > static const VMStateDescription vmstate_ahci_device = { > .name = "ahci port", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_IDE_BUS(port, AHCIDevice), > VMSTATE_UINT32(port_state, AHCIDevice), > VMSTATE_UINT32(finished, AHCIDevice), > @@ -1284,7 +1284,7 @@ const VMStateDescription vmstate_ahci = { > .name = "ahci", > .version_id = 1, > .post_load = ahci_state_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports, > vmstate_ahci_device, AHCIDevice), > VMSTATE_UINT32(control_regs.cap, AHCIState), > @@ -1313,7 +1313,7 @@ typedef struct SysbusAHCIState { > static const VMStateDescription vmstate_sysbus_ahci = { > .name = "sysbus-ahci", > .unmigratable = 1, /* Still buggy under I/O load */ > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_AHCI(ahci, SysbusAHCIState), > VMSTATE_END_OF_LIST() > }, > diff --git a/hw/ide/ich.c b/hw/ide/ich.c > index 1c7c058..a2f1639 100644 > --- a/hw/ide/ich.c > +++ b/hw/ide/ich.c > @@ -83,7 +83,7 @@ static const VMStateDescription vmstate_ich9_ahci = { > .name = "ich9_ahci", > .unmigratable = 1, /* Still buggy under I/O load */ > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState), > VMSTATE_AHCI(ahci, AHCIPCIState), > VMSTATE_END_OF_LIST() > diff --git a/hw/ide/isa.c b/hw/ide/isa.c > index d2cabc1..4cbcb1c 100644 > --- a/hw/ide/isa.c > +++ b/hw/ide/isa.c > @@ -57,8 +57,7 @@ static const VMStateDescription vmstate_ide_isa = { > .name = "isa-ide", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_IDE_BUS(bus, ISAIDEState), > VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), > VMSTATE_END_OF_LIST() > diff --git a/hw/ide/pci.c b/hw/ide/pci.c > index d8b1157..6257a21 100644 > --- a/hw/ide/pci.c > +++ b/hw/ide/pci.c > @@ -411,8 +411,7 @@ static const VMStateDescription vmstate_bmdma_current = { > .name = "ide bmdma_current", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(cur_addr, BMDMAState), > VMSTATE_UINT32(cur_prd_last, BMDMAState), > VMSTATE_UINT32(cur_prd_addr, BMDMAState), > @@ -425,8 +424,7 @@ static const VMStateDescription vmstate_bmdma_status = { > .name ="ide bmdma/status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(status, BMDMAState), > VMSTATE_END_OF_LIST() > } > @@ -436,9 +434,8 @@ static const VMStateDescription vmstate_bmdma = { > .name = "ide bmdma", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = ide_bmdma_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(cmd, BMDMAState), > VMSTATE_UINT8(migration_compat_status, BMDMAState), > VMSTATE_UINT32(addr, BMDMAState), > @@ -479,9 +476,8 @@ const VMStateDescription vmstate_ide_pci = { > .name = "ide", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = ide_pci_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIIDEState), > VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, 0, > vmstate_bmdma, BMDMAState), > diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c > index 29af3d7..ca1cffc 100644 > --- a/hw/input/pckbd.c > +++ b/hw/input/pckbd.c > @@ -373,8 +373,7 @@ static const VMStateDescription vmstate_kbd = { > .name = "pckbd", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(write_cmd, KBDState), > VMSTATE_UINT8(status, KBDState), > VMSTATE_UINT8(mode, KBDState), > @@ -462,8 +461,7 @@ static const VMStateDescription vmstate_kbd_isa = { > .name = "pckbd", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(kbd, ISAKBDState, 0, vmstate_kbd, KBDState), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/input/ps2.c b/hw/input/ps2.c > index 3412079..0a0bd80 100644 > --- a/hw/input/ps2.c > +++ b/hw/input/ps2.c > @@ -559,8 +559,7 @@ static const VMStateDescription vmstate_ps2_common = { > .name = "PS2 Common State", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(write_cmd, PS2State), > VMSTATE_INT32(queue.rptr, PS2State), > VMSTATE_INT32(queue.wptr, PS2State), > @@ -589,9 +588,8 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = { > .name = "ps2kbd/ledstate", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ps2_kbd_ledstate_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(ledstate, PS2KbdState), > VMSTATE_END_OF_LIST() > } > @@ -610,9 +608,8 @@ static const VMStateDescription vmstate_ps2_keyboard = { > .name = "ps2kbd", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ps2_kbd_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), > VMSTATE_INT32(scan_enabled, PS2KbdState), > VMSTATE_INT32(translate, PS2KbdState), > @@ -633,8 +630,7 @@ static const VMStateDescription vmstate_ps2_mouse = { > .name = "ps2mouse", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State), > VMSTATE_UINT8(mouse_status, PS2MouseState), > VMSTATE_UINT8(mouse_resolution, PS2MouseState), > diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c > index 6a50533..d7b1c76 100644 > --- a/hw/input/vmmouse.c > +++ b/hw/input/vmmouse.c > @@ -240,9 +240,8 @@ static const VMStateDescription vmstate_vmmouse = { > .name = "vmmouse", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = vmmouse_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(queue_size, VMMouseState), > VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), > VMSTATE_UINT16(nb_queue, VMMouseState), > diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c > index 61381c4..fbf26e5 100644 > --- a/hw/intc/i8259_common.c > +++ b/hw/intc/i8259_common.c > @@ -98,7 +98,6 @@ static const VMStateDescription vmstate_pic_common = { > .name = "i8259", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = pic_dispatch_pre_save, > .post_load = pic_dispatch_post_load, > .fields = (VMStateField[]) { > diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c > index 4d3d309..8b7d118 100644 > --- a/hw/intc/ioapic_common.c > +++ b/hw/intc/ioapic_common.c > @@ -86,7 +86,6 @@ static const VMStateDescription vmstate_ioapic_common = { > .name = "ioapic", > .version_id = 3, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = ioapic_dispatch_pre_save, > .post_load = ioapic_dispatch_post_load, > .fields = (VMStateField[]) { > diff --git a/hw/isa/apm.c b/hw/isa/apm.c > index f97e7a0..054d529 100644 > --- a/hw/isa/apm.c > +++ b/hw/isa/apm.c > @@ -72,7 +72,6 @@ const VMStateDescription vmstate_apm = { > .name = "APM State", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT8(apmc, APMState), > VMSTATE_UINT8(apms, APMState), > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index 51ce12d..97f69d6 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -616,7 +616,6 @@ static const VMStateDescription vmstate_ich9_lpc = { > .name = "ICH9LPC", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = ich9_lpc_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(d, ICH9LPCState), > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 492cd22..1aa17d7 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -76,8 +76,7 @@ static const VMStateDescription vmstate_piix4 = { > .name = "PIIX4", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PIIX4State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c > index 1a93afd..e0c235c 100644 > --- a/hw/isa/vt82c686.c > +++ b/hw/isa/vt82c686.c > @@ -230,9 +230,8 @@ static const VMStateDescription vmstate_acpi = { > .name = "vt82c686b_pm", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = vmstate_acpi_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, VT686PMState), > VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState), > VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState), > @@ -418,8 +417,7 @@ static const VMStateDescription vmstate_via = { > .name = "vt82c686b", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, VT82C686BState), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/net/e1000.c b/hw/net/e1000.c > index 8387443..a13b8c3 100644 > --- a/hw/net/e1000.c > +++ b/hw/net/e1000.c > @@ -1341,8 +1341,7 @@ static const VMStateDescription vmstate_e1000_mit_state = { > .name = "e1000/mit_state", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(mac_reg[RDTR], E1000State), > VMSTATE_UINT32(mac_reg[RADV], E1000State), > VMSTATE_UINT32(mac_reg[TADV], E1000State), > @@ -1356,10 +1355,9 @@ static const VMStateDescription vmstate_e1000 = { > .name = "e1000", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = e1000_pre_save, > .post_load = e1000_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, E1000State), > VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */ > VMSTATE_UNUSED(4), /* Was mmio_base. */ > diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c > index 3b891ca..aaa3ff2 100644 > --- a/hw/net/eepro100.c > +++ b/hw/net/eepro100.c > @@ -1784,8 +1784,7 @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size) > static const VMStateDescription vmstate_eepro100 = { > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, EEPRO100State), > VMSTATE_UNUSED(32), > VMSTATE_BUFFER(mult, EEPRO100State), > diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c > index c660e58..8740844 100644 > --- a/hw/net/ne2000-isa.c > +++ b/hw/net/ne2000-isa.c > @@ -59,8 +59,7 @@ static const VMStateDescription vmstate_isa_ne2000 = { > .name = "ne2000", > .version_id = 2, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(ne2000, ISANE2000State, 0, vmstate_ne2000, NE2000State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c > index 4c32e9e..d558b8c 100644 > --- a/hw/net/ne2000.c > +++ b/hw/net/ne2000.c > @@ -615,9 +615,8 @@ const VMStateDescription vmstate_ne2000 = { > .name = "ne2000", > .version_id = 2, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = ne2000_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8_V(rxcr, NE2000State, 2), > VMSTATE_UINT8(cmd, NE2000State), > VMSTATE_UINT32(start, NE2000State), > @@ -645,8 +644,7 @@ static const VMStateDescription vmstate_pci_ne2000 = { > .name = "ne2000", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCINE2000State), > VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State), > VMSTATE_END_OF_LIST() > diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c > index 6a5d806..b25d789 100644 > --- a/hw/net/pcnet-pci.c > +++ b/hw/net/pcnet-pci.c > @@ -241,8 +241,7 @@ static const VMStateDescription vmstate_pci_pcnet = { > .name = "pcnet", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIPCNetState), > VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), > VMSTATE_END_OF_LIST() > diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c > index 7cb47b3..8c54692 100644 > --- a/hw/net/pcnet.c > +++ b/hw/net/pcnet.c > @@ -1701,8 +1701,7 @@ const VMStateDescription vmstate_pcnet = { > .name = "pcnet", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(rap, PCNetState), > VMSTATE_INT32(isr, PCNetState), > VMSTATE_INT32(lnkst, PCNetState), > diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c > index 5329f44..90bc5ec 100644 > --- a/hw/net/rtl8139.c > +++ b/hw/net/rtl8139.c > @@ -1358,8 +1358,7 @@ static const VMStateDescription vmstate_tally_counters = { > .name = "tally_counters", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(TxOk, RTL8139TallyCounters), > VMSTATE_UINT64(RxOk, RTL8139TallyCounters), > VMSTATE_UINT64(TxERR, RTL8139TallyCounters), > @@ -3271,8 +3270,7 @@ static const VMStateDescription vmstate_rtl8139_hotplug_ready ={ > .name = "rtl8139/hotplug_ready", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_END_OF_LIST() > } > }; > @@ -3293,10 +3291,9 @@ static const VMStateDescription vmstate_rtl8139 = { > .name = "rtl8139", > .version_id = 4, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > .post_load = rtl8139_post_load, > .pre_save = rtl8139_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, RTL8139State), > VMSTATE_PARTIAL_BUFFER(phys, RTL8139State, 6), > VMSTATE_BUFFER(mult, RTL8139State), > diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c > index ddcee4b..d8e8d59 100644 > --- a/hw/net/vmxnet3.c > +++ b/hw/net/vmxnet3.c > @@ -2223,7 +2223,6 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { > .name = "vmxnet3/mcast_list", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_load = vmxnet3_mcast_list_pre_load, > .fields = (VMStateField[]) { > VMSTATE_VBUFFER_UINT32(mcast_list, VMXNET3State, 0, NULL, 0, > @@ -2433,10 +2432,9 @@ static const VMStateDescription vmstate_vmxnet3 = { > .name = "vmxnet3", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = vmxnet3_pre_save, > .post_load = vmxnet3_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), > VMSTATE_BOOL(rx_packets_compound, VMXNET3State), > VMSTATE_BOOL(rx_vlan_stripping, VMXNET3State), > diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c > index a98f924..0af4d67 100644 > --- a/hw/nvram/eeprom93xx.c > +++ b/hw/nvram/eeprom93xx.c > @@ -125,8 +125,7 @@ static const VMStateDescription vmstate_eeprom = { > .name = "eeprom", > .version_id = EEPROM_VERSION, > .minimum_version_id = OLD_EEPROM_VERSION, > - .minimum_version_id_old = OLD_EEPROM_VERSION, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(tick, eeprom_t), > VMSTATE_UINT8(address, eeprom_t), > VMSTATE_UINT8(command, eeprom_t), > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 282341a..b71d251 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -377,8 +377,7 @@ static const VMStateDescription vmstate_fw_cfg = { > .name = "fw_cfg", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(cur_entry, FWCfgState), > VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), > VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), > diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c > index 0f7f209..f4e17ac 100644 > --- a/hw/pci-bridge/ioh3420.c > +++ b/hw/pci-bridge/ioh3420.c > @@ -184,7 +184,6 @@ static const VMStateDescription vmstate_ioh3420 = { > .name = "ioh-3240-express-root-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = pcie_cap_slot_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), > diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c > index 94f9781..8f22f93 100644 > --- a/hw/pci-bridge/xio3130_downstream.c > +++ b/hw/pci-bridge/xio3130_downstream.c > @@ -151,7 +151,6 @@ static const VMStateDescription vmstate_xio3130_downstream = { > .name = "xio3130-express-downstream-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = pcie_cap_slot_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), > diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c > index 59f97f6..eada582 100644 > --- a/hw/pci-bridge/xio3130_upstream.c > +++ b/hw/pci-bridge/xio3130_upstream.c > @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_xio3130_upstream = { > .name = "xio3130-express-upstream-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), > VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index ffdc853..e0e0946 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -203,7 +203,7 @@ static const VMStateDescription vmstate_i440fx = { > .minimum_version_id_old = 1, > .load_state_old = i440fx_load_old, > .post_load = i440fx_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), > VMSTATE_UINT8(smm_enabled, PCII440FXState), > VMSTATE_END_OF_LIST() > @@ -553,7 +553,7 @@ static const VMStateDescription vmstate_piix3_rcr = { > .name = "PIIX3/rcr", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(rcr, PIIX3State), > VMSTATE_END_OF_LIST() > } > @@ -563,10 +563,9 @@ static const VMStateDescription vmstate_piix3 = { > .name = "PIIX3", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = piix3_post_load, > .pre_save = piix3_pre_save, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PIIX3State), > VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIX3State, > PIIX_NUM_PIRQS, 3), > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 8b8cc4e..571e523 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -330,9 +330,8 @@ static const VMStateDescription vmstate_mch = { > .name = "mch", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = mch_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState), > VMSTATE_UINT8(smm_enabled, MCHPCIState), > VMSTATE_END_OF_LIST() > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 2a9f08e..d4375b6 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -64,8 +64,7 @@ static const VMStateDescription vmstate_pcibus = { > .name = "PCIBUS", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(nirq, PCIBus), > VMSTATE_VARRAY_INT32(irq_count, PCIBus, > nirq, 0, vmstate_info_int32, > @@ -473,8 +472,7 @@ const VMStateDescription vmstate_pci_device = { > .name = "PCIDevice", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_LE(version_id, PCIDevice), > VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, > vmstate_info_pci_config, > @@ -490,8 +488,7 @@ const VMStateDescription vmstate_pcie_device = { > .name = "PCIEDevice", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_LE(version_id, PCIDevice), > VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, > vmstate_info_pci_config, > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index 991502e..090f307 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -784,8 +784,7 @@ static const VMStateDescription vmstate_pcie_aer_err = { > .name = "PCIE_AER_ERROR", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(status, PCIEAERErr), > VMSTATE_UINT16(source_id, PCIEAERErr), > VMSTATE_UINT16(flags, PCIEAERErr), > @@ -799,8 +798,7 @@ const VMStateDescription vmstate_pcie_aer_log = { > .name = "PCIE_AER_ERROR_LOG", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(log_num, PCIEAERLog), > VMSTATE_UINT16(log_max, PCIEAERLog), > VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num, > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > index cb30414..786d848 100644 > --- a/hw/scsi/lsi53c895a.c > +++ b/hw/scsi/lsi53c895a.c > @@ -1994,9 +1994,8 @@ static const VMStateDescription vmstate_lsi_scsi = { > .name = "lsiscsi", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = lsi_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, LSIState), > > VMSTATE_INT32(carry, LSIState), > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index e6e1ffd..c735c08 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -2065,8 +2065,7 @@ static const VMStateDescription vmstate_megasas = { > .name = "megasas", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, MegasasState), > > VMSTATE_INT32(fw_state, MegasasState), > diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c > index ae921a6..a137c98 100644 > --- a/hw/scsi/scsi-bus.c > +++ b/hw/scsi/scsi-bus.c > @@ -1915,8 +1915,7 @@ static const VMStateDescription vmstate_scsi_sense_state = { > .name = "SCSIDevice/sense", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, > SCSI_SENSE_BUF_SIZE_OLD, > SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD), > @@ -1928,7 +1927,6 @@ const VMStateDescription vmstate_scsi_device = { > .name = "SCSIDevice", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT8(unit_attention.key, SCSIDevice), > VMSTATE_UINT8(unit_attention.asc, SCSIDevice), > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 48a28ae..f05c772 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2571,7 +2571,6 @@ static const VMStateDescription vmstate_scsi_disk_state = { > .name = "scsi-disk", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_SCSI_DEVICE(qdev, SCSIDiskState), > VMSTATE_BOOL(media_changed, SCSIDiskState), > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > index e35bff7..f9ed926 100644 > --- a/hw/scsi/vmw_pvscsi.c > +++ b/hw/scsi/vmw_pvscsi.c > @@ -1143,10 +1143,9 @@ static const VMStateDescription vmstate_pvscsi = { > .name = "pvscsi", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = pvscsi_pre_save, > .post_load = pvscsi_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), > VMSTATE_UINT8(msi_used, PVSCSIState), > VMSTATE_UINT32(resetting, PVSCSIState), > diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c > index e15d6bc..fa590e3 100644 > --- a/hw/timer/hpet.c > +++ b/hw/timer/hpet.c > @@ -270,8 +270,7 @@ static const VMStateDescription vmstate_hpet_rtc_irq_level = { > .name = "hpet/rtc_irq_level", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(rtc_irq_level, HPETState), > VMSTATE_END_OF_LIST() > } > @@ -281,8 +280,7 @@ static const VMStateDescription vmstate_hpet_timer = { > .name = "hpet_timer", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(tn, HPETTimer), > VMSTATE_UINT64(config, HPETTimer), > VMSTATE_UINT64(cmp, HPETTimer), > @@ -298,11 +296,10 @@ static const VMStateDescription vmstate_hpet = { > .name = "hpet", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = hpet_pre_save, > .pre_load = hpet_pre_load, > .post_load = hpet_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(config, HPETState), > VMSTATE_UINT64(isr, HPETState), > VMSTATE_UINT64(hpet_counter, HPETState), > diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c > index 9db5c9d..07345f6 100644 > --- a/hw/timer/i8254_common.c > +++ b/hw/timer/i8254_common.c > @@ -180,7 +180,6 @@ static const VMStateDescription vmstate_pit_channel = { > .name = "pit channel", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .fields = (VMStateField[]) { > VMSTATE_INT32(count, PITChannelState), > VMSTATE_UINT16(latched_count, PITChannelState), > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index 8509309..1822af2 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -720,9 +720,8 @@ static const VMStateDescription vmstate_rtc = { > .name = "mc146818rtc", > .version_id = 3, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = rtc_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_BUFFER(cmos_data, RTCState), > VMSTATE_UINT8(cmos_index, RTCState), > VMSTATE_UNUSED(7*4), > diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c > index 36d3887..b3d6f39 100644 > --- a/hw/watchdog/wdt_i6300esb.c > +++ b/hw/watchdog/wdt_i6300esb.c > @@ -379,18 +379,18 @@ static const VMStateDescription vmstate_i6300esb = { > * version_id to be set for every build. This eventually broke > * migration. > * > - * To correct this without breaking old->new migration for older versions > - * of QEMU, we've set version_id to a value high enough to exceed all past > - * values of sizeof(I6300State) across various build environments, and have > - * reset minimum_version_id_old/minimum_version_id to 1, since this VMSD > - * has never changed and thus can accept all past versions. > + * To correct this without breaking old->new migration for older > + * versions of QEMU, we've set version_id to a value high enough > + * to exceed all past values of sizeof(I6300State) across various > + * build environments, and have reset minimum_version_id to 1, > + * since this VMSD has never changed and thus can accept all past > + * versions. > * > * For future changes we can treat these values as we normally would. > */ > .version_id = 10000, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, I6300State), > VMSTATE_INT32(reboot_enabled, I6300State), > VMSTATE_INT32(clock_scale, I6300State), > diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c > index bc994a4..99bd7ea 100644 > --- a/hw/watchdog/wdt_ib700.c > +++ b/hw/watchdog/wdt_ib700.c > @@ -90,8 +90,7 @@ static const VMStateDescription vmstate_ib700 = { > .name = "ib700_wdt", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_TIMER(timer, IB700State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c > index 1d9d0e9..8bb18b4 100644 > --- a/hw/xen/xen_platform.c > +++ b/hw/xen/xen_platform.c > @@ -375,9 +375,8 @@ static const VMStateDescription vmstate_xen_platform = { > .name = "platform", > .version_id = 4, > .minimum_version_id = 4, > - .minimum_version_id_old = 4, > .post_load = xen_platform_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIXenPlatformState), > VMSTATE_UINT8(flags, PCIXenPlatformState), > VMSTATE_END_OF_LIST() > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 168cab6..fe3f024 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -10,8 +10,7 @@ static const VMStateDescription vmstate_segment = { > .name = "segment", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(selector, SegmentCache), > VMSTATE_UINTTL(base, SegmentCache), > VMSTATE_UINT32(limit, SegmentCache), > @@ -36,8 +35,7 @@ static const VMStateDescription vmstate_xmm_reg = { > .name = "xmm_reg", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(XMM_Q(0), XMMReg), > VMSTATE_UINT64(XMM_Q(1), XMMReg), > VMSTATE_END_OF_LIST() > @@ -52,8 +50,7 @@ static const VMStateDescription vmstate_ymmh_reg = { > .name = "ymmh_reg", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(XMM_Q(0), XMMReg), > VMSTATE_UINT64(XMM_Q(1), XMMReg), > VMSTATE_END_OF_LIST() > @@ -67,8 +64,7 @@ static const VMStateDescription vmstate_bnd_regs = { > .name = "bnd_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(lb, BNDReg), > VMSTATE_UINT64(ub, BNDReg), > VMSTATE_END_OF_LIST() > @@ -82,8 +78,7 @@ static const VMStateDescription vmstate_mtrr_var = { > .name = "mtrr_var", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(base, MTRRVar), > VMSTATE_UINT64(mask, MTRRVar), > VMSTATE_END_OF_LIST() > @@ -355,8 +350,7 @@ static const VMStateDescription vmstate_steal_time_msr = { > .name = "cpu/steal_time_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.steal_time_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -366,8 +360,7 @@ static const VMStateDescription vmstate_async_pf_msr = { > .name = "cpu/async_pf_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.async_pf_en_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -377,8 +370,7 @@ static const VMStateDescription vmstate_pv_eoi_msr = { > .name = "cpu/async_pv_eoi_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.pv_eoi_en_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -396,8 +388,7 @@ static const VMStateDescription vmstate_fpop_ip_dp = { > .name = "cpu/fpop_ip_dp", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(env.fpop, X86CPU), > VMSTATE_UINT64(env.fpip, X86CPU), > VMSTATE_UINT64(env.fpdp, X86CPU), > @@ -417,8 +408,7 @@ static const VMStateDescription vmstate_msr_tsc_adjust = { > .name = "cpu/msr_tsc_adjust", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.tsc_adjust, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -436,8 +426,7 @@ static const VMStateDescription vmstate_msr_tscdeadline = { > .name = "cpu/msr_tscdeadline", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.tsc_deadline, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -463,8 +452,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = { > .name = "cpu/msr_ia32_misc_enable", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_ia32_misc_enable, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -474,8 +462,7 @@ static const VMStateDescription vmstate_msr_ia32_feature_control = { > .name = "cpu/msr_ia32_feature_control", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_ia32_feature_control, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -509,8 +496,7 @@ static const VMStateDescription vmstate_msr_architectural_pmu = { > .name = "cpu/msr_architectural_pmu", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_fixed_ctr_ctrl, X86CPU), > VMSTATE_UINT64(env.msr_global_ctrl, X86CPU), > VMSTATE_UINT64(env.msr_global_status, X86CPU), > @@ -545,8 +531,7 @@ static const VMStateDescription vmstate_mpx = { > .name = "cpu/mpx", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_BND_REGS(env.bnd_regs, X86CPU, 4), > VMSTATE_UINT64(env.bndcs_regs.cfgu, X86CPU), > VMSTATE_UINT64(env.bndcs_regs.sts, X86CPU), > @@ -567,8 +552,7 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { > .name = "cpu/msr_hyperv_hypercall", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), > VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_END_OF_LIST() > @@ -587,8 +571,7 @@ static const VMStateDescription vmstate_msr_hyperv_vapic = { > .name = "cpu/msr_hyperv_vapic", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_vapic, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -606,8 +589,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = { > .name = "cpu/msr_hyperv_time", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_tsc, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -617,10 +599,9 @@ const VMStateDescription vmstate_x86_cpu = { > .name = "cpu", > .version_id = 12, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > .pre_save = cpu_pre_save, > .post_load = cpu_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINTTL_ARRAY(env.regs, X86CPU, CPU_NB_REGS), > VMSTATE_UINTTL(env.eip, X86CPU), > VMSTATE_UINTTL(env.eflags, X86CPU),
On 06/04/2014 09:36 PM, Juan Quintela wrote: > Juan Quintela <quintela@redhat.com> wrote: >> After previous Peter patch, they are redundant. This way we don't asign them >> except when needed. Once there, there were lots of case where the ".fields" >> indentation was wrong: >> >> .fields = (VMStateField []) { >> and >> .fields = (VMStateField []) { >> >> Change all the combinations to: >> >> .fields = (VMStateField[]){ >> >> The biggest problem (appart of aesthetics) was that checkpatch complained >> when we copy&pasted the code from one place to another. >> >> Signed-off-by: Juan Quintela <quintela@redhat.com> > > Hi > > could any of you review this? > Changes are trivial. Acked-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > Thanks, Juan. > >> --- >> hw/acpi/ich9.c | 1 - >> hw/acpi/pcihp.c | 3 +- >> hw/acpi/piix4.c | 8 ++---- >> hw/audio/ac97.c | 6 ++-- >> hw/audio/cs4231.c | 3 +- >> hw/audio/cs4231a.c | 3 +- >> hw/audio/es1370.c | 6 ++-- >> hw/audio/gus.c | 3 +- >> hw/audio/hda-codec.c | 4 +-- >> hw/audio/intel-hda.c | 4 +-- >> hw/audio/sb16.c | 3 +- >> hw/block/fdc.c | 16 ++++------- >> hw/char/serial-pci.c | 4 +-- >> hw/char/serial.c | 2 +- >> hw/display/cirrus_vga.c | 6 ++-- >> hw/display/vga-pci.c | 3 +- >> hw/display/vga.c | 3 +- >> hw/display/vmware_vga.c | 6 ++-- >> hw/dma/i8257.c | 6 ++-- >> hw/i386/acpi-build.c | 3 +- >> hw/i386/kvm/clock.c | 1 - >> hw/i386/kvmvapic.c | 3 -- >> hw/i386/pc.c | 3 +- >> hw/ide/ahci.c | 6 ++-- >> hw/ide/ich.c | 2 +- >> hw/ide/isa.c | 3 +- >> hw/ide/pci.c | 12 +++----- >> hw/input/pckbd.c | 6 ++-- >> hw/input/ps2.c | 12 +++----- >> hw/input/vmmouse.c | 3 +- >> hw/intc/i8259_common.c | 1 - >> hw/intc/ioapic_common.c | 1 - >> hw/isa/apm.c | 1 - >> hw/isa/lpc_ich9.c | 1 - >> hw/isa/piix4.c | 3 +- >> hw/isa/vt82c686.c | 6 ++-- >> hw/net/e1000.c | 6 ++-- >> hw/net/eepro100.c | 3 +- >> hw/net/ne2000-isa.c | 3 +- >> hw/net/ne2000.c | 6 ++-- >> hw/net/pcnet-pci.c | 3 +- >> hw/net/pcnet.c | 3 +- >> hw/net/rtl8139.c | 9 ++---- >> hw/net/vmxnet3.c | 4 +-- >> hw/nvram/eeprom93xx.c | 3 +- >> hw/nvram/fw_cfg.c | 3 +- >> hw/pci-bridge/ioh3420.c | 1 - >> hw/pci-bridge/xio3130_downstream.c | 1 - >> hw/pci-bridge/xio3130_upstream.c | 1 - >> hw/pci-host/piix.c | 7 ++--- >> hw/pci-host/q35.c | 3 +- >> hw/pci/pci.c | 9 ++---- >> hw/pci/pcie_aer.c | 6 ++-- >> hw/scsi/lsi53c895a.c | 3 +- >> hw/scsi/megasas.c | 3 +- >> hw/scsi/scsi-bus.c | 4 +-- >> hw/scsi/scsi-disk.c | 1 - >> hw/scsi/vmw_pvscsi.c | 3 +- >> hw/timer/hpet.c | 9 ++---- >> hw/timer/i8254_common.c | 1 - >> hw/timer/mc146818rtc.c | 3 +- >> hw/watchdog/wdt_i6300esb.c | 14 +++++----- >> hw/watchdog/wdt_ib700.c | 3 +- >> hw/xen/xen_platform.c | 3 +- >> target-i386/machine.c | 57 +++++++++++++------------------------- >> 65 files changed, 113 insertions(+), 219 deletions(-) >> >> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c >> index 0afac42..407ae89 100644 >> --- a/hw/acpi/ich9.c >> +++ b/hw/acpi/ich9.c >> @@ -143,7 +143,6 @@ const VMStateDescription vmstate_ich9_pm = { >> .name = "ich9_pm", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = ich9_pm_post_load, >> .fields = (VMStateField[]) { >> VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs), >> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c >> index f80c480..d807cf1 100644 >> --- a/hw/acpi/pcihp.c >> +++ b/hw/acpi/pcihp.c >> @@ -322,8 +322,7 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = { >> .name = "acpi_pcihp_pci_status", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(up, AcpiPciHpPciStatus), >> VMSTATE_UINT32(down, AcpiPciHpPciStatus), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c >> index 67dc075..252bbf2 100644 >> --- a/hw/acpi/piix4.c >> +++ b/hw/acpi/piix4.c >> @@ -177,8 +177,7 @@ static const VMStateDescription vmstate_gpe = { >> .name = "gpe", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_GPE_ARRAY(sts, ACPIGPE), >> VMSTATE_GPE_ARRAY(en, ACPIGPE), >> VMSTATE_END_OF_LIST() >> @@ -189,8 +188,7 @@ static const VMStateDescription vmstate_pci_status = { >> .name = "pci_status", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(up, struct AcpiPciHpPciStatus), >> VMSTATE_UINT32(down, struct AcpiPciHpPciStatus), >> VMSTATE_END_OF_LIST() >> @@ -259,7 +257,7 @@ static const VMStateDescription vmstate_acpi = { >> .minimum_version_id_old = 1, >> .load_state_old = acpi_load_old, >> .post_load = vmstate_acpi_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), >> VMSTATE_UINT16(ar.pm1.evt.sts, PIIX4PMState), >> VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), >> diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c >> index 03f4846..45cb118 100644 >> --- a/hw/audio/ac97.c >> +++ b/hw/audio/ac97.c >> @@ -1163,8 +1163,7 @@ static const VMStateDescription vmstate_ac97_bm_regs = { >> .name = "ac97_bm_regs", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32 (bdbar, AC97BusMasterRegs), >> VMSTATE_UINT8 (civ, AC97BusMasterRegs), >> VMSTATE_UINT8 (lvi, AC97BusMasterRegs), >> @@ -1211,9 +1210,8 @@ static const VMStateDescription vmstate_ac97 = { >> .name = "ac97", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = ac97_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE (dev, AC97LinkState), >> VMSTATE_UINT32 (glob_cnt, AC97LinkState), >> VMSTATE_UINT32 (glob_sta, AC97LinkState), >> diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c >> index d19195a..6325a8c 100644 >> --- a/hw/audio/cs4231.c >> +++ b/hw/audio/cs4231.c >> @@ -137,8 +137,7 @@ static const VMStateDescription vmstate_cs4231 = { >> .name ="cs4231", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS), >> VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c >> index a0ec17a..f96f561 100644 >> --- a/hw/audio/cs4231a.c >> +++ b/hw/audio/cs4231a.c >> @@ -621,10 +621,9 @@ static const VMStateDescription vmstate_cs4231a = { >> .name = "cs4231a", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_load = cs4231a_pre_load, >> .post_load = cs4231a_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32_ARRAY (regs, CSState, CS_REGS), >> VMSTATE_BUFFER (dregs, CSState), >> VMSTATE_INT32 (dma_running, CSState), >> diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c >> index 1ec7ace..5dbf803 100644 >> --- a/hw/audio/es1370.c >> +++ b/hw/audio/es1370.c >> @@ -953,8 +953,7 @@ static const VMStateDescription vmstate_es1370_channel = { >> .name = "es1370_channel", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32 (shift, struct chan), >> VMSTATE_UINT32 (leftover, struct chan), >> VMSTATE_UINT32 (scount, struct chan), >> @@ -997,9 +996,8 @@ static const VMStateDescription vmstate_es1370 = { >> .name = "es1370", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = es1370_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE (dev, ES1370State), >> VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2, >> vmstate_es1370_channel, struct chan), >> diff --git a/hw/audio/gus.c b/hw/audio/gus.c >> index e29a571..bba6840 100644 >> --- a/hw/audio/gus.c >> +++ b/hw/audio/gus.c >> @@ -222,8 +222,7 @@ static const VMStateDescription vmstate_gus = { >> .name = "gus", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32 (pos, GUSState), >> VMSTATE_INT32 (left, GUSState), >> VMSTATE_INT32 (shift, GUSState), >> diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c >> index a67ca91..09559ef 100644 >> --- a/hw/audio/hda-codec.c >> +++ b/hw/audio/hda-codec.c >> @@ -580,7 +580,7 @@ static void hda_audio_reset(DeviceState *dev) >> static const VMStateDescription vmstate_hda_audio_stream = { >> .name = "hda-audio-stream", >> .version_id = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(stream, HDAAudioStream), >> VMSTATE_UINT32(channel, HDAAudioStream), >> VMSTATE_UINT32(format, HDAAudioStream), >> @@ -598,7 +598,7 @@ static const VMStateDescription vmstate_hda_audio = { >> .name = "hda-audio", >> .version_id = 2, >> .post_load = hda_audio_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0, >> vmstate_hda_audio_stream, >> HDAAudioStream), >> diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c >> index d41f82c..1c660a4 100644 >> --- a/hw/audio/intel-hda.c >> +++ b/hw/audio/intel-hda.c >> @@ -1175,7 +1175,7 @@ static int intel_hda_post_load(void *opaque, int version) >> static const VMStateDescription vmstate_intel_hda_stream = { >> .name = "intel-hda-stream", >> .version_id = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(ctl, IntelHDAStream), >> VMSTATE_UINT32(lpib, IntelHDAStream), >> VMSTATE_UINT32(cbl, IntelHDAStream), >> @@ -1191,7 +1191,7 @@ static const VMStateDescription vmstate_intel_hda = { >> .name = "intel-hda", >> .version_id = 1, >> .post_load = intel_hda_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(pci, IntelHDAState), >> >> /* registers */ >> diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c >> index bb24e00..60c4b3b 100644 >> --- a/hw/audio/sb16.c >> +++ b/hw/audio/sb16.c >> @@ -1289,9 +1289,8 @@ static const VMStateDescription vmstate_sb16 = { >> .name = "sb16", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = sb16_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32 (irq, SB16State), >> VMSTATE_UINT32 (dma, SB16State), >> VMSTATE_UINT32 (hdma, SB16State), >> diff --git a/hw/block/fdc.c b/hw/block/fdc.c >> index 1651007..490d127 100644 >> --- a/hw/block/fdc.c >> +++ b/hw/block/fdc.c >> @@ -672,8 +672,7 @@ static const VMStateDescription vmstate_fdrive_media_changed = { >> .name = "fdrive/media_changed", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(media_changed, FDrive), >> VMSTATE_END_OF_LIST() >> } >> @@ -690,8 +689,7 @@ static const VMStateDescription vmstate_fdrive_media_rate = { >> .name = "fdrive/media_rate", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(media_rate, FDrive), >> VMSTATE_END_OF_LIST() >> } >> @@ -701,8 +699,7 @@ static const VMStateDescription vmstate_fdrive = { >> .name = "fdrive", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(head, FDrive), >> VMSTATE_UINT8(track, FDrive), >> VMSTATE_UINT8(sect, FDrive), >> @@ -741,10 +738,9 @@ static const VMStateDescription vmstate_fdc = { >> .name = "fdc", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .pre_save = fdc_pre_save, >> .post_load = fdc_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> /* Controller State */ >> VMSTATE_UINT8(sra, FDCtrl), >> VMSTATE_UINT8(srb, FDCtrl), >> @@ -2209,7 +2205,7 @@ static const VMStateDescription vmstate_isa_fdc ={ >> .name = "fdc", >> .version_id = 2, >> .minimum_version_id = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), >> VMSTATE_END_OF_LIST() >> } >> @@ -2251,7 +2247,7 @@ static const VMStateDescription vmstate_sysbus_fdc ={ >> .name = "fdc", >> .version_id = 2, >> .minimum_version_id = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c >> index 991c99f..44f50c3 100644 >> --- a/hw/char/serial-pci.c >> +++ b/hw/char/serial-pci.c >> @@ -155,7 +155,7 @@ static const VMStateDescription vmstate_pci_serial = { >> .name = "pci-serial", >> .version_id = 1, >> .minimum_version_id = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PCISerialState), >> VMSTATE_STRUCT(state, PCISerialState, 0, vmstate_serial, SerialState), >> VMSTATE_END_OF_LIST() >> @@ -166,7 +166,7 @@ static const VMStateDescription vmstate_pci_multi_serial = { >> .name = "pci-serial-multi", >> .version_id = 1, >> .minimum_version_id = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState), >> VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS, >> 0, vmstate_serial, SerialState), >> diff --git a/hw/char/serial.c b/hw/char/serial.c >> index f4d167f..d17da16 100644 >> --- a/hw/char/serial.c >> +++ b/hw/char/serial.c >> @@ -602,7 +602,7 @@ const VMStateDescription vmstate_serial = { >> .minimum_version_id = 2, >> .pre_save = serial_pre_save, >> .post_load = serial_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT16_V(divider, SerialState, 2), >> VMSTATE_UINT8(rbr, SerialState), >> VMSTATE_UINT8(ier, SerialState), >> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c >> index 0d3127d..55449a6 100644 >> --- a/hw/display/cirrus_vga.c >> +++ b/hw/display/cirrus_vga.c >> @@ -2702,9 +2702,8 @@ static const VMStateDescription vmstate_cirrus_vga = { >> .name = "cirrus_vga", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = cirrus_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(vga.latch, CirrusVGAState), >> VMSTATE_UINT8(vga.sr_index, CirrusVGAState), >> VMSTATE_BUFFER(vga.sr, CirrusVGAState), >> @@ -2742,8 +2741,7 @@ static const VMStateDescription vmstate_pci_cirrus_vga = { >> .name = "cirrus_vga", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PCICirrusVGAState), >> VMSTATE_STRUCT(cirrus_vga, PCICirrusVGAState, 0, >> vmstate_cirrus_vga, CirrusVGAState), >> diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c >> index 574ea0e..a2a9ca1 100644 >> --- a/hw/display/vga-pci.c >> +++ b/hw/display/vga-pci.c >> @@ -54,8 +54,7 @@ static const VMStateDescription vmstate_vga_pci = { >> .name = "vga", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PCIVGAState), >> VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common, VGACommonState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/display/vga.c b/hw/display/vga.c >> index 063319d..9e35dd2 100644 >> --- a/hw/display/vga.c >> +++ b/hw/display/vga.c >> @@ -2210,9 +2210,8 @@ const VMStateDescription vmstate_vga_common = { >> .name = "vga", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = vga_common_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(latch, VGACommonState), >> VMSTATE_UINT8(sr_index, VGACommonState), >> VMSTATE_PARTIAL_BUFFER(sr, VGACommonState, 8), >> diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c >> index 6ae3348..00bb385 100644 >> --- a/hw/display/vmware_vga.c >> +++ b/hw/display/vmware_vga.c >> @@ -1152,9 +1152,8 @@ static const VMStateDescription vmstate_vmware_vga_internal = { >> .name = "vmware_vga_internal", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .post_load = vmsvga_post_load, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s), >> VMSTATE_INT32(enable, struct vmsvga_state_s), >> VMSTATE_INT32(config, struct vmsvga_state_s), >> @@ -1179,8 +1178,7 @@ static const VMStateDescription vmstate_vmware_vga = { >> .name = "vmware_vga", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, struct pci_vmsvga_state_s), >> VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0, >> vmstate_vmware_vga_internal, struct vmsvga_state_s), >> diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c >> index 4490372..dd370ed 100644 >> --- a/hw/dma/i8257.c >> +++ b/hw/dma/i8257.c >> @@ -551,8 +551,7 @@ static const VMStateDescription vmstate_dma_regs = { >> .name = "dma_regs", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_ARRAY(now, struct dma_regs, 2), >> VMSTATE_UINT16_ARRAY(base, struct dma_regs, 2), >> VMSTATE_UINT8(mode, struct dma_regs), >> @@ -575,9 +574,8 @@ static const VMStateDescription vmstate_dma = { >> .name = "dma", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = dma_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(command, struct dma_cont), >> VMSTATE_UINT8(mask, struct dma_cont), >> VMSTATE_UINT8(flip_flop, struct dma_cont), >> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c >> index c98df88..faf5f4f 100644 >> --- a/hw/i386/acpi-build.c >> +++ b/hw/i386/acpi-build.c >> @@ -1497,8 +1497,7 @@ static const VMStateDescription vmstate_acpi_build = { >> .name = "acpi_build", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(patched, AcpiBuildState), >> VMSTATE_END_OF_LIST() >> }, >> diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c >> index 892aa02..07b9c0e 100644 >> --- a/hw/i386/kvm/clock.c >> +++ b/hw/i386/kvm/clock.c >> @@ -102,7 +102,6 @@ static const VMStateDescription kvmclock_vmsd = { >> .name = "kvmclock", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_UINT64(clock, KVMClockState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c >> index a1c3d1c..a730f4b 100644 >> --- a/hw/i386/kvmvapic.c >> +++ b/hw/i386/kvmvapic.c >> @@ -773,7 +773,6 @@ static const VMStateDescription vmstate_handlers = { >> .name = "kvmvapic-handlers", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_UINT32(set_tpr, VAPICHandlers), >> VMSTATE_UINT32(set_tpr_eax, VAPICHandlers), >> @@ -787,7 +786,6 @@ static const VMStateDescription vmstate_guest_rom = { >> .name = "kvmvapic-guest-rom", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_UNUSED(8), /* signature */ >> VMSTATE_UINT32(vaddr, GuestROMState), >> @@ -807,7 +805,6 @@ static const VMStateDescription vmstate_vapic = { >> .name = "kvm-tpr-opt", /* compatible with qemu-kvm VAPIC */ >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = vapic_post_load, >> .fields = (VMStateField[]) { >> VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom, >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index 14f0d91..5155393 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -502,8 +502,7 @@ static const VMStateDescription vmstate_port92_isa = { >> .name = "port92", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(outport, Port92State), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c >> index bfe633f..a225181 100644 >> --- a/hw/ide/ahci.c >> +++ b/hw/ide/ahci.c >> @@ -1225,7 +1225,7 @@ void ahci_reset(AHCIState *s) >> static const VMStateDescription vmstate_ahci_device = { >> .name = "ahci port", >> .version_id = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_IDE_BUS(port, AHCIDevice), >> VMSTATE_UINT32(port_state, AHCIDevice), >> VMSTATE_UINT32(finished, AHCIDevice), >> @@ -1284,7 +1284,7 @@ const VMStateDescription vmstate_ahci = { >> .name = "ahci", >> .version_id = 1, >> .post_load = ahci_state_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports, >> vmstate_ahci_device, AHCIDevice), >> VMSTATE_UINT32(control_regs.cap, AHCIState), >> @@ -1313,7 +1313,7 @@ typedef struct SysbusAHCIState { >> static const VMStateDescription vmstate_sysbus_ahci = { >> .name = "sysbus-ahci", >> .unmigratable = 1, /* Still buggy under I/O load */ >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_AHCI(ahci, SysbusAHCIState), >> VMSTATE_END_OF_LIST() >> }, >> diff --git a/hw/ide/ich.c b/hw/ide/ich.c >> index 1c7c058..a2f1639 100644 >> --- a/hw/ide/ich.c >> +++ b/hw/ide/ich.c >> @@ -83,7 +83,7 @@ static const VMStateDescription vmstate_ich9_ahci = { >> .name = "ich9_ahci", >> .unmigratable = 1, /* Still buggy under I/O load */ >> .version_id = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState), >> VMSTATE_AHCI(ahci, AHCIPCIState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/ide/isa.c b/hw/ide/isa.c >> index d2cabc1..4cbcb1c 100644 >> --- a/hw/ide/isa.c >> +++ b/hw/ide/isa.c >> @@ -57,8 +57,7 @@ static const VMStateDescription vmstate_ide_isa = { >> .name = "isa-ide", >> .version_id = 3, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_IDE_BUS(bus, ISAIDEState), >> VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/ide/pci.c b/hw/ide/pci.c >> index d8b1157..6257a21 100644 >> --- a/hw/ide/pci.c >> +++ b/hw/ide/pci.c >> @@ -411,8 +411,7 @@ static const VMStateDescription vmstate_bmdma_current = { >> .name = "ide bmdma_current", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(cur_addr, BMDMAState), >> VMSTATE_UINT32(cur_prd_last, BMDMAState), >> VMSTATE_UINT32(cur_prd_addr, BMDMAState), >> @@ -425,8 +424,7 @@ static const VMStateDescription vmstate_bmdma_status = { >> .name ="ide bmdma/status", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(status, BMDMAState), >> VMSTATE_END_OF_LIST() >> } >> @@ -436,9 +434,8 @@ static const VMStateDescription vmstate_bmdma = { >> .name = "ide bmdma", >> .version_id = 3, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .pre_save = ide_bmdma_pre_save, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(cmd, BMDMAState), >> VMSTATE_UINT8(migration_compat_status, BMDMAState), >> VMSTATE_UINT32(addr, BMDMAState), >> @@ -479,9 +476,8 @@ const VMStateDescription vmstate_ide_pci = { >> .name = "ide", >> .version_id = 3, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .post_load = ide_pci_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PCIIDEState), >> VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, 0, >> vmstate_bmdma, BMDMAState), >> diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c >> index 29af3d7..ca1cffc 100644 >> --- a/hw/input/pckbd.c >> +++ b/hw/input/pckbd.c >> @@ -373,8 +373,7 @@ static const VMStateDescription vmstate_kbd = { >> .name = "pckbd", >> .version_id = 3, >> .minimum_version_id = 3, >> - .minimum_version_id_old = 3, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(write_cmd, KBDState), >> VMSTATE_UINT8(status, KBDState), >> VMSTATE_UINT8(mode, KBDState), >> @@ -462,8 +461,7 @@ static const VMStateDescription vmstate_kbd_isa = { >> .name = "pckbd", >> .version_id = 3, >> .minimum_version_id = 3, >> - .minimum_version_id_old = 3, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(kbd, ISAKBDState, 0, vmstate_kbd, KBDState), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/input/ps2.c b/hw/input/ps2.c >> index 3412079..0a0bd80 100644 >> --- a/hw/input/ps2.c >> +++ b/hw/input/ps2.c >> @@ -559,8 +559,7 @@ static const VMStateDescription vmstate_ps2_common = { >> .name = "PS2 Common State", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32(write_cmd, PS2State), >> VMSTATE_INT32(queue.rptr, PS2State), >> VMSTATE_INT32(queue.wptr, PS2State), >> @@ -589,9 +588,8 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = { >> .name = "ps2kbd/ledstate", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = ps2_kbd_ledstate_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32(ledstate, PS2KbdState), >> VMSTATE_END_OF_LIST() >> } >> @@ -610,9 +608,8 @@ static const VMStateDescription vmstate_ps2_keyboard = { >> .name = "ps2kbd", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = ps2_kbd_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), >> VMSTATE_INT32(scan_enabled, PS2KbdState), >> VMSTATE_INT32(translate, PS2KbdState), >> @@ -633,8 +630,7 @@ static const VMStateDescription vmstate_ps2_mouse = { >> .name = "ps2mouse", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State), >> VMSTATE_UINT8(mouse_status, PS2MouseState), >> VMSTATE_UINT8(mouse_resolution, PS2MouseState), >> diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c >> index 6a50533..d7b1c76 100644 >> --- a/hw/input/vmmouse.c >> +++ b/hw/input/vmmouse.c >> @@ -240,9 +240,8 @@ static const VMStateDescription vmstate_vmmouse = { >> .name = "vmmouse", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .post_load = vmmouse_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_EQUAL(queue_size, VMMouseState), >> VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), >> VMSTATE_UINT16(nb_queue, VMMouseState), >> diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c >> index 61381c4..fbf26e5 100644 >> --- a/hw/intc/i8259_common.c >> +++ b/hw/intc/i8259_common.c >> @@ -98,7 +98,6 @@ static const VMStateDescription vmstate_pic_common = { >> .name = "i8259", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_save = pic_dispatch_pre_save, >> .post_load = pic_dispatch_post_load, >> .fields = (VMStateField[]) { >> diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c >> index 4d3d309..8b7d118 100644 >> --- a/hw/intc/ioapic_common.c >> +++ b/hw/intc/ioapic_common.c >> @@ -86,7 +86,6 @@ static const VMStateDescription vmstate_ioapic_common = { >> .name = "ioapic", >> .version_id = 3, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_save = ioapic_dispatch_pre_save, >> .post_load = ioapic_dispatch_post_load, >> .fields = (VMStateField[]) { >> diff --git a/hw/isa/apm.c b/hw/isa/apm.c >> index f97e7a0..054d529 100644 >> --- a/hw/isa/apm.c >> +++ b/hw/isa/apm.c >> @@ -72,7 +72,6 @@ const VMStateDescription vmstate_apm = { >> .name = "APM State", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_UINT8(apmc, APMState), >> VMSTATE_UINT8(apms, APMState), >> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c >> index 51ce12d..97f69d6 100644 >> --- a/hw/isa/lpc_ich9.c >> +++ b/hw/isa/lpc_ich9.c >> @@ -616,7 +616,6 @@ static const VMStateDescription vmstate_ich9_lpc = { >> .name = "ICH9LPC", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = ich9_lpc_post_load, >> .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(d, ICH9LPCState), >> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c >> index 492cd22..1aa17d7 100644 >> --- a/hw/isa/piix4.c >> +++ b/hw/isa/piix4.c >> @@ -76,8 +76,7 @@ static const VMStateDescription vmstate_piix4 = { >> .name = "PIIX4", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PIIX4State), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c >> index 1a93afd..e0c235c 100644 >> --- a/hw/isa/vt82c686.c >> +++ b/hw/isa/vt82c686.c >> @@ -230,9 +230,8 @@ static const VMStateDescription vmstate_acpi = { >> .name = "vt82c686b_pm", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = vmstate_acpi_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, VT686PMState), >> VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState), >> VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState), >> @@ -418,8 +417,7 @@ static const VMStateDescription vmstate_via = { >> .name = "vt82c686b", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, VT82C686BState), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/net/e1000.c b/hw/net/e1000.c >> index 8387443..a13b8c3 100644 >> --- a/hw/net/e1000.c >> +++ b/hw/net/e1000.c >> @@ -1341,8 +1341,7 @@ static const VMStateDescription vmstate_e1000_mit_state = { >> .name = "e1000/mit_state", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(mac_reg[RDTR], E1000State), >> VMSTATE_UINT32(mac_reg[RADV], E1000State), >> VMSTATE_UINT32(mac_reg[TADV], E1000State), >> @@ -1356,10 +1355,9 @@ static const VMStateDescription vmstate_e1000 = { >> .name = "e1000", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_save = e1000_pre_save, >> .post_load = e1000_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, E1000State), >> VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */ >> VMSTATE_UNUSED(4), /* Was mmio_base. */ >> diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c >> index 3b891ca..aaa3ff2 100644 >> --- a/hw/net/eepro100.c >> +++ b/hw/net/eepro100.c >> @@ -1784,8 +1784,7 @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size) >> static const VMStateDescription vmstate_eepro100 = { >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, EEPRO100State), >> VMSTATE_UNUSED(32), >> VMSTATE_BUFFER(mult, EEPRO100State), >> diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c >> index c660e58..8740844 100644 >> --- a/hw/net/ne2000-isa.c >> +++ b/hw/net/ne2000-isa.c >> @@ -59,8 +59,7 @@ static const VMStateDescription vmstate_isa_ne2000 = { >> .name = "ne2000", >> .version_id = 2, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_STRUCT(ne2000, ISANE2000State, 0, vmstate_ne2000, NE2000State), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c >> index 4c32e9e..d558b8c 100644 >> --- a/hw/net/ne2000.c >> +++ b/hw/net/ne2000.c >> @@ -615,9 +615,8 @@ const VMStateDescription vmstate_ne2000 = { >> .name = "ne2000", >> .version_id = 2, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .post_load = ne2000_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8_V(rxcr, NE2000State, 2), >> VMSTATE_UINT8(cmd, NE2000State), >> VMSTATE_UINT32(start, NE2000State), >> @@ -645,8 +644,7 @@ static const VMStateDescription vmstate_pci_ne2000 = { >> .name = "ne2000", >> .version_id = 3, >> .minimum_version_id = 3, >> - .minimum_version_id_old = 3, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PCINE2000State), >> VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c >> index 6a5d806..b25d789 100644 >> --- a/hw/net/pcnet-pci.c >> +++ b/hw/net/pcnet-pci.c >> @@ -241,8 +241,7 @@ static const VMStateDescription vmstate_pci_pcnet = { >> .name = "pcnet", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PCIPCNetState), >> VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c >> index 7cb47b3..8c54692 100644 >> --- a/hw/net/pcnet.c >> +++ b/hw/net/pcnet.c >> @@ -1701,8 +1701,7 @@ const VMStateDescription vmstate_pcnet = { >> .name = "pcnet", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32(rap, PCNetState), >> VMSTATE_INT32(isr, PCNetState), >> VMSTATE_INT32(lnkst, PCNetState), >> diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c >> index 5329f44..90bc5ec 100644 >> --- a/hw/net/rtl8139.c >> +++ b/hw/net/rtl8139.c >> @@ -1358,8 +1358,7 @@ static const VMStateDescription vmstate_tally_counters = { >> .name = "tally_counters", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(TxOk, RTL8139TallyCounters), >> VMSTATE_UINT64(RxOk, RTL8139TallyCounters), >> VMSTATE_UINT64(TxERR, RTL8139TallyCounters), >> @@ -3271,8 +3270,7 @@ static const VMStateDescription vmstate_rtl8139_hotplug_ready ={ >> .name = "rtl8139/hotplug_ready", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_END_OF_LIST() >> } >> }; >> @@ -3293,10 +3291,9 @@ static const VMStateDescription vmstate_rtl8139 = { >> .name = "rtl8139", >> .version_id = 4, >> .minimum_version_id = 3, >> - .minimum_version_id_old = 3, >> .post_load = rtl8139_post_load, >> .pre_save = rtl8139_pre_save, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, RTL8139State), >> VMSTATE_PARTIAL_BUFFER(phys, RTL8139State, 6), >> VMSTATE_BUFFER(mult, RTL8139State), >> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c >> index ddcee4b..d8e8d59 100644 >> --- a/hw/net/vmxnet3.c >> +++ b/hw/net/vmxnet3.c >> @@ -2223,7 +2223,6 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { >> .name = "vmxnet3/mcast_list", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_load = vmxnet3_mcast_list_pre_load, >> .fields = (VMStateField[]) { >> VMSTATE_VBUFFER_UINT32(mcast_list, VMXNET3State, 0, NULL, 0, >> @@ -2433,10 +2432,9 @@ static const VMStateDescription vmstate_vmxnet3 = { >> .name = "vmxnet3", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_save = vmxnet3_pre_save, >> .post_load = vmxnet3_post_load, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), >> VMSTATE_BOOL(rx_packets_compound, VMXNET3State), >> VMSTATE_BOOL(rx_vlan_stripping, VMXNET3State), >> diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c >> index a98f924..0af4d67 100644 >> --- a/hw/nvram/eeprom93xx.c >> +++ b/hw/nvram/eeprom93xx.c >> @@ -125,8 +125,7 @@ static const VMStateDescription vmstate_eeprom = { >> .name = "eeprom", >> .version_id = EEPROM_VERSION, >> .minimum_version_id = OLD_EEPROM_VERSION, >> - .minimum_version_id_old = OLD_EEPROM_VERSION, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(tick, eeprom_t), >> VMSTATE_UINT8(address, eeprom_t), >> VMSTATE_UINT8(command, eeprom_t), >> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c >> index 282341a..b71d251 100644 >> --- a/hw/nvram/fw_cfg.c >> +++ b/hw/nvram/fw_cfg.c >> @@ -377,8 +377,7 @@ static const VMStateDescription vmstate_fw_cfg = { >> .name = "fw_cfg", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT16(cur_entry, FWCfgState), >> VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), >> VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), >> diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c >> index 0f7f209..f4e17ac 100644 >> --- a/hw/pci-bridge/ioh3420.c >> +++ b/hw/pci-bridge/ioh3420.c >> @@ -184,7 +184,6 @@ static const VMStateDescription vmstate_ioh3420 = { >> .name = "ioh-3240-express-root-port", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = pcie_cap_slot_post_load, >> .fields = (VMStateField[]) { >> VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), >> diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c >> index 94f9781..8f22f93 100644 >> --- a/hw/pci-bridge/xio3130_downstream.c >> +++ b/hw/pci-bridge/xio3130_downstream.c >> @@ -151,7 +151,6 @@ static const VMStateDescription vmstate_xio3130_downstream = { >> .name = "xio3130-express-downstream-port", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = pcie_cap_slot_post_load, >> .fields = (VMStateField[]) { >> VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), >> diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c >> index 59f97f6..eada582 100644 >> --- a/hw/pci-bridge/xio3130_upstream.c >> +++ b/hw/pci-bridge/xio3130_upstream.c >> @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_xio3130_upstream = { >> .name = "xio3130-express-upstream-port", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), >> VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, >> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c >> index ffdc853..e0e0946 100644 >> --- a/hw/pci-host/piix.c >> +++ b/hw/pci-host/piix.c >> @@ -203,7 +203,7 @@ static const VMStateDescription vmstate_i440fx = { >> .minimum_version_id_old = 1, >> .load_state_old = i440fx_load_old, >> .post_load = i440fx_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), >> VMSTATE_UINT8(smm_enabled, PCII440FXState), >> VMSTATE_END_OF_LIST() >> @@ -553,7 +553,7 @@ static const VMStateDescription vmstate_piix3_rcr = { >> .name = "PIIX3/rcr", >> .version_id = 1, >> .minimum_version_id = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(rcr, PIIX3State), >> VMSTATE_END_OF_LIST() >> } >> @@ -563,10 +563,9 @@ static const VMStateDescription vmstate_piix3 = { >> .name = "PIIX3", >> .version_id = 3, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .post_load = piix3_post_load, >> .pre_save = piix3_pre_save, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, PIIX3State), >> VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIX3State, >> PIIX_NUM_PIRQS, 3), >> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c >> index 8b8cc4e..571e523 100644 >> --- a/hw/pci-host/q35.c >> +++ b/hw/pci-host/q35.c >> @@ -330,9 +330,8 @@ static const VMStateDescription vmstate_mch = { >> .name = "mch", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = mch_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState), >> VMSTATE_UINT8(smm_enabled, MCHPCIState), >> VMSTATE_END_OF_LIST() >> diff --git a/hw/pci/pci.c b/hw/pci/pci.c >> index 2a9f08e..d4375b6 100644 >> --- a/hw/pci/pci.c >> +++ b/hw/pci/pci.c >> @@ -64,8 +64,7 @@ static const VMStateDescription vmstate_pcibus = { >> .name = "PCIBUS", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_EQUAL(nirq, PCIBus), >> VMSTATE_VARRAY_INT32(irq_count, PCIBus, >> nirq, 0, vmstate_info_int32, >> @@ -473,8 +472,7 @@ const VMStateDescription vmstate_pci_device = { >> .name = "PCIDevice", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_LE(version_id, PCIDevice), >> VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, >> vmstate_info_pci_config, >> @@ -490,8 +488,7 @@ const VMStateDescription vmstate_pcie_device = { >> .name = "PCIEDevice", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_INT32_LE(version_id, PCIDevice), >> VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, >> vmstate_info_pci_config, >> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c >> index 991502e..090f307 100644 >> --- a/hw/pci/pcie_aer.c >> +++ b/hw/pci/pcie_aer.c >> @@ -784,8 +784,7 @@ static const VMStateDescription vmstate_pcie_aer_err = { >> .name = "PCIE_AER_ERROR", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(status, PCIEAERErr), >> VMSTATE_UINT16(source_id, PCIEAERErr), >> VMSTATE_UINT16(flags, PCIEAERErr), >> @@ -799,8 +798,7 @@ const VMStateDescription vmstate_pcie_aer_log = { >> .name = "PCIE_AER_ERROR_LOG", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT16(log_num, PCIEAERLog), >> VMSTATE_UINT16(log_max, PCIEAERLog), >> VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num, >> diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c >> index cb30414..786d848 100644 >> --- a/hw/scsi/lsi53c895a.c >> +++ b/hw/scsi/lsi53c895a.c >> @@ -1994,9 +1994,8 @@ static const VMStateDescription vmstate_lsi_scsi = { >> .name = "lsiscsi", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .pre_save = lsi_pre_save, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, LSIState), >> >> VMSTATE_INT32(carry, LSIState), >> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c >> index e6e1ffd..c735c08 100644 >> --- a/hw/scsi/megasas.c >> +++ b/hw/scsi/megasas.c >> @@ -2065,8 +2065,7 @@ static const VMStateDescription vmstate_megasas = { >> .name = "megasas", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, MegasasState), >> >> VMSTATE_INT32(fw_state, MegasasState), >> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c >> index ae921a6..a137c98 100644 >> --- a/hw/scsi/scsi-bus.c >> +++ b/hw/scsi/scsi-bus.c >> @@ -1915,8 +1915,7 @@ static const VMStateDescription vmstate_scsi_sense_state = { >> .name = "SCSIDevice/sense", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, >> SCSI_SENSE_BUF_SIZE_OLD, >> SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD), >> @@ -1928,7 +1927,6 @@ const VMStateDescription vmstate_scsi_device = { >> .name = "SCSIDevice", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_UINT8(unit_attention.key, SCSIDevice), >> VMSTATE_UINT8(unit_attention.asc, SCSIDevice), >> diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c >> index 48a28ae..f05c772 100644 >> --- a/hw/scsi/scsi-disk.c >> +++ b/hw/scsi/scsi-disk.c >> @@ -2571,7 +2571,6 @@ static const VMStateDescription vmstate_scsi_disk_state = { >> .name = "scsi-disk", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .fields = (VMStateField[]) { >> VMSTATE_SCSI_DEVICE(qdev, SCSIDiskState), >> VMSTATE_BOOL(media_changed, SCSIDiskState), >> diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c >> index e35bff7..f9ed926 100644 >> --- a/hw/scsi/vmw_pvscsi.c >> +++ b/hw/scsi/vmw_pvscsi.c >> @@ -1143,10 +1143,9 @@ static const VMStateDescription vmstate_pvscsi = { >> .name = "pvscsi", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> .pre_save = pvscsi_pre_save, >> .post_load = pvscsi_post_load, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), >> VMSTATE_UINT8(msi_used, PVSCSIState), >> VMSTATE_UINT32(resetting, PVSCSIState), >> diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c >> index e15d6bc..fa590e3 100644 >> --- a/hw/timer/hpet.c >> +++ b/hw/timer/hpet.c >> @@ -270,8 +270,7 @@ static const VMStateDescription vmstate_hpet_rtc_irq_level = { >> .name = "hpet/rtc_irq_level", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(rtc_irq_level, HPETState), >> VMSTATE_END_OF_LIST() >> } >> @@ -281,8 +280,7 @@ static const VMStateDescription vmstate_hpet_timer = { >> .name = "hpet_timer", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT8(tn, HPETTimer), >> VMSTATE_UINT64(config, HPETTimer), >> VMSTATE_UINT64(cmp, HPETTimer), >> @@ -298,11 +296,10 @@ static const VMStateDescription vmstate_hpet = { >> .name = "hpet", >> .version_id = 2, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .pre_save = hpet_pre_save, >> .pre_load = hpet_pre_load, >> .post_load = hpet_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(config, HPETState), >> VMSTATE_UINT64(isr, HPETState), >> VMSTATE_UINT64(hpet_counter, HPETState), >> diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c >> index 9db5c9d..07345f6 100644 >> --- a/hw/timer/i8254_common.c >> +++ b/hw/timer/i8254_common.c >> @@ -180,7 +180,6 @@ static const VMStateDescription vmstate_pit_channel = { >> .name = "pit channel", >> .version_id = 2, >> .minimum_version_id = 2, >> - .minimum_version_id_old = 2, >> .fields = (VMStateField[]) { >> VMSTATE_INT32(count, PITChannelState), >> VMSTATE_UINT16(latched_count, PITChannelState), >> diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c >> index 8509309..1822af2 100644 >> --- a/hw/timer/mc146818rtc.c >> +++ b/hw/timer/mc146818rtc.c >> @@ -720,9 +720,8 @@ static const VMStateDescription vmstate_rtc = { >> .name = "mc146818rtc", >> .version_id = 3, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> .post_load = rtc_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_BUFFER(cmos_data, RTCState), >> VMSTATE_UINT8(cmos_index, RTCState), >> VMSTATE_UNUSED(7*4), >> diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c >> index 36d3887..b3d6f39 100644 >> --- a/hw/watchdog/wdt_i6300esb.c >> +++ b/hw/watchdog/wdt_i6300esb.c >> @@ -379,18 +379,18 @@ static const VMStateDescription vmstate_i6300esb = { >> * version_id to be set for every build. This eventually broke >> * migration. >> * >> - * To correct this without breaking old->new migration for older versions >> - * of QEMU, we've set version_id to a value high enough to exceed all past >> - * values of sizeof(I6300State) across various build environments, and have >> - * reset minimum_version_id_old/minimum_version_id to 1, since this VMSD >> - * has never changed and thus can accept all past versions. >> + * To correct this without breaking old->new migration for older >> + * versions of QEMU, we've set version_id to a value high enough >> + * to exceed all past values of sizeof(I6300State) across various >> + * build environments, and have reset minimum_version_id to 1, >> + * since this VMSD has never changed and thus can accept all past >> + * versions. >> * >> * For future changes we can treat these values as we normally would. >> */ >> .version_id = 10000, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(dev, I6300State), >> VMSTATE_INT32(reboot_enabled, I6300State), >> VMSTATE_INT32(clock_scale, I6300State), >> diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c >> index bc994a4..99bd7ea 100644 >> --- a/hw/watchdog/wdt_ib700.c >> +++ b/hw/watchdog/wdt_ib700.c >> @@ -90,8 +90,7 @@ static const VMStateDescription vmstate_ib700 = { >> .name = "ib700_wdt", >> .version_id = 0, >> .minimum_version_id = 0, >> - .minimum_version_id_old = 0, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_TIMER(timer, IB700State), >> VMSTATE_END_OF_LIST() >> } >> diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c >> index 1d9d0e9..8bb18b4 100644 >> --- a/hw/xen/xen_platform.c >> +++ b/hw/xen/xen_platform.c >> @@ -375,9 +375,8 @@ static const VMStateDescription vmstate_xen_platform = { >> .name = "platform", >> .version_id = 4, >> .minimum_version_id = 4, >> - .minimum_version_id_old = 4, >> .post_load = xen_platform_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_PCI_DEVICE(parent_obj, PCIXenPlatformState), >> VMSTATE_UINT8(flags, PCIXenPlatformState), >> VMSTATE_END_OF_LIST() >> diff --git a/target-i386/machine.c b/target-i386/machine.c >> index 168cab6..fe3f024 100644 >> --- a/target-i386/machine.c >> +++ b/target-i386/machine.c >> @@ -10,8 +10,7 @@ static const VMStateDescription vmstate_segment = { >> .name = "segment", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT32(selector, SegmentCache), >> VMSTATE_UINTTL(base, SegmentCache), >> VMSTATE_UINT32(limit, SegmentCache), >> @@ -36,8 +35,7 @@ static const VMStateDescription vmstate_xmm_reg = { >> .name = "xmm_reg", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(XMM_Q(0), XMMReg), >> VMSTATE_UINT64(XMM_Q(1), XMMReg), >> VMSTATE_END_OF_LIST() >> @@ -52,8 +50,7 @@ static const VMStateDescription vmstate_ymmh_reg = { >> .name = "ymmh_reg", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(XMM_Q(0), XMMReg), >> VMSTATE_UINT64(XMM_Q(1), XMMReg), >> VMSTATE_END_OF_LIST() >> @@ -67,8 +64,7 @@ static const VMStateDescription vmstate_bnd_regs = { >> .name = "bnd_regs", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(lb, BNDReg), >> VMSTATE_UINT64(ub, BNDReg), >> VMSTATE_END_OF_LIST() >> @@ -82,8 +78,7 @@ static const VMStateDescription vmstate_mtrr_var = { >> .name = "mtrr_var", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(base, MTRRVar), >> VMSTATE_UINT64(mask, MTRRVar), >> VMSTATE_END_OF_LIST() >> @@ -355,8 +350,7 @@ static const VMStateDescription vmstate_steal_time_msr = { >> .name = "cpu/steal_time_msr", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.steal_time_msr, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -366,8 +360,7 @@ static const VMStateDescription vmstate_async_pf_msr = { >> .name = "cpu/async_pf_msr", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.async_pf_en_msr, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -377,8 +370,7 @@ static const VMStateDescription vmstate_pv_eoi_msr = { >> .name = "cpu/async_pv_eoi_msr", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.pv_eoi_en_msr, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -396,8 +388,7 @@ static const VMStateDescription vmstate_fpop_ip_dp = { >> .name = "cpu/fpop_ip_dp", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT16(env.fpop, X86CPU), >> VMSTATE_UINT64(env.fpip, X86CPU), >> VMSTATE_UINT64(env.fpdp, X86CPU), >> @@ -417,8 +408,7 @@ static const VMStateDescription vmstate_msr_tsc_adjust = { >> .name = "cpu/msr_tsc_adjust", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.tsc_adjust, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -436,8 +426,7 @@ static const VMStateDescription vmstate_msr_tscdeadline = { >> .name = "cpu/msr_tscdeadline", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.tsc_deadline, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -463,8 +452,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = { >> .name = "cpu/msr_ia32_misc_enable", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_ia32_misc_enable, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -474,8 +462,7 @@ static const VMStateDescription vmstate_msr_ia32_feature_control = { >> .name = "cpu/msr_ia32_feature_control", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_ia32_feature_control, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -509,8 +496,7 @@ static const VMStateDescription vmstate_msr_architectural_pmu = { >> .name = "cpu/msr_architectural_pmu", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_fixed_ctr_ctrl, X86CPU), >> VMSTATE_UINT64(env.msr_global_ctrl, X86CPU), >> VMSTATE_UINT64(env.msr_global_status, X86CPU), >> @@ -545,8 +531,7 @@ static const VMStateDescription vmstate_mpx = { >> .name = "cpu/mpx", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField[]) { >> + .fields = (VMStateField[]) { >> VMSTATE_BND_REGS(env.bnd_regs, X86CPU, 4), >> VMSTATE_UINT64(env.bndcs_regs.cfgu, X86CPU), >> VMSTATE_UINT64(env.bndcs_regs.sts, X86CPU), >> @@ -567,8 +552,7 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { >> .name = "cpu/msr_hyperv_hypercall", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), >> VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), >> VMSTATE_END_OF_LIST() >> @@ -587,8 +571,7 @@ static const VMStateDescription vmstate_msr_hyperv_vapic = { >> .name = "cpu/msr_hyperv_vapic", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_hv_vapic, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -606,8 +589,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = { >> .name = "cpu/msr_hyperv_time", >> .version_id = 1, >> .minimum_version_id = 1, >> - .minimum_version_id_old = 1, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINT64(env.msr_hv_tsc, X86CPU), >> VMSTATE_END_OF_LIST() >> } >> @@ -617,10 +599,9 @@ const VMStateDescription vmstate_x86_cpu = { >> .name = "cpu", >> .version_id = 12, >> .minimum_version_id = 3, >> - .minimum_version_id_old = 3, >> .pre_save = cpu_pre_save, >> .post_load = cpu_post_load, >> - .fields = (VMStateField []) { >> + .fields = (VMStateField[]) { >> VMSTATE_UINTTL_ARRAY(env.regs, X86CPU, CPU_NB_REGS), >> VMSTATE_UINTTL(env.eip, X86CPU), >> VMSTATE_UINTTL(env.eflags, X86CPU), >
On Mon, Apr 21, 2014 at 04:39:45PM +0200, Juan Quintela wrote: > After previous Peter patch, they are redundant. This way we don't asign them > except when needed. Once there, there were lots of case where the ".fields" > indentation was wrong: > > .fields = (VMStateField []) { > and > .fields = (VMStateField []) { > > Change all the combinations to: > > .fields = (VMStateField[]){ > > The biggest problem (appart of aesthetics) was that checkpatch complained > when we copy&pasted the code from one place to another. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/acpi/ich9.c | 1 - > hw/acpi/pcihp.c | 3 +- > hw/acpi/piix4.c | 8 ++---- > hw/audio/ac97.c | 6 ++-- > hw/audio/cs4231.c | 3 +- > hw/audio/cs4231a.c | 3 +- > hw/audio/es1370.c | 6 ++-- > hw/audio/gus.c | 3 +- > hw/audio/hda-codec.c | 4 +-- > hw/audio/intel-hda.c | 4 +-- > hw/audio/sb16.c | 3 +- > hw/block/fdc.c | 16 ++++------- > hw/char/serial-pci.c | 4 +-- > hw/char/serial.c | 2 +- > hw/display/cirrus_vga.c | 6 ++-- > hw/display/vga-pci.c | 3 +- > hw/display/vga.c | 3 +- > hw/display/vmware_vga.c | 6 ++-- > hw/dma/i8257.c | 6 ++-- > hw/i386/acpi-build.c | 3 +- > hw/i386/kvm/clock.c | 1 - > hw/i386/kvmvapic.c | 3 -- > hw/i386/pc.c | 3 +- > hw/ide/ahci.c | 6 ++-- > hw/ide/ich.c | 2 +- > hw/ide/isa.c | 3 +- > hw/ide/pci.c | 12 +++----- > hw/input/pckbd.c | 6 ++-- > hw/input/ps2.c | 12 +++----- > hw/input/vmmouse.c | 3 +- > hw/intc/i8259_common.c | 1 - > hw/intc/ioapic_common.c | 1 - > hw/isa/apm.c | 1 - > hw/isa/lpc_ich9.c | 1 - > hw/isa/piix4.c | 3 +- > hw/isa/vt82c686.c | 6 ++-- > hw/net/e1000.c | 6 ++-- > hw/net/eepro100.c | 3 +- > hw/net/ne2000-isa.c | 3 +- > hw/net/ne2000.c | 6 ++-- > hw/net/pcnet-pci.c | 3 +- > hw/net/pcnet.c | 3 +- > hw/net/rtl8139.c | 9 ++---- > hw/net/vmxnet3.c | 4 +-- > hw/nvram/eeprom93xx.c | 3 +- > hw/nvram/fw_cfg.c | 3 +- > hw/pci-bridge/ioh3420.c | 1 - > hw/pci-bridge/xio3130_downstream.c | 1 - > hw/pci-bridge/xio3130_upstream.c | 1 - > hw/pci-host/piix.c | 7 ++--- > hw/pci-host/q35.c | 3 +- > hw/pci/pci.c | 9 ++---- > hw/pci/pcie_aer.c | 6 ++-- > hw/scsi/lsi53c895a.c | 3 +- > hw/scsi/megasas.c | 3 +- > hw/scsi/scsi-bus.c | 4 +-- > hw/scsi/scsi-disk.c | 1 - > hw/scsi/vmw_pvscsi.c | 3 +- > hw/timer/hpet.c | 9 ++---- > hw/timer/i8254_common.c | 1 - > hw/timer/mc146818rtc.c | 3 +- > hw/watchdog/wdt_i6300esb.c | 14 +++++----- > hw/watchdog/wdt_ib700.c | 3 +- > hw/xen/xen_platform.c | 3 +- > target-i386/machine.c | 57 +++++++++++++------------------------- > 65 files changed, 113 insertions(+), 219 deletions(-) > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index 0afac42..407ae89 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -143,7 +143,6 @@ const VMStateDescription vmstate_ich9_pm = { > .name = "ich9_pm", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = ich9_pm_post_load, > .fields = (VMStateField[]) { > VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs), > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index f80c480..d807cf1 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -322,8 +322,7 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = { > .name = "acpi_pcihp_pci_status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(up, AcpiPciHpPciStatus), > VMSTATE_UINT32(down, AcpiPciHpPciStatus), > VMSTATE_END_OF_LIST() > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index 67dc075..252bbf2 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -177,8 +177,7 @@ static const VMStateDescription vmstate_gpe = { > .name = "gpe", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_GPE_ARRAY(sts, ACPIGPE), > VMSTATE_GPE_ARRAY(en, ACPIGPE), > VMSTATE_END_OF_LIST() > @@ -189,8 +188,7 @@ static const VMStateDescription vmstate_pci_status = { > .name = "pci_status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(up, struct AcpiPciHpPciStatus), > VMSTATE_UINT32(down, struct AcpiPciHpPciStatus), > VMSTATE_END_OF_LIST() > @@ -259,7 +257,7 @@ static const VMStateDescription vmstate_acpi = { > .minimum_version_id_old = 1, > .load_state_old = acpi_load_old, > .post_load = vmstate_acpi_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), > VMSTATE_UINT16(ar.pm1.evt.sts, PIIX4PMState), > VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), > diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c > index 03f4846..45cb118 100644 > --- a/hw/audio/ac97.c > +++ b/hw/audio/ac97.c > @@ -1163,8 +1163,7 @@ static const VMStateDescription vmstate_ac97_bm_regs = { > .name = "ac97_bm_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (bdbar, AC97BusMasterRegs), > VMSTATE_UINT8 (civ, AC97BusMasterRegs), > VMSTATE_UINT8 (lvi, AC97BusMasterRegs), > @@ -1211,9 +1210,8 @@ static const VMStateDescription vmstate_ac97 = { > .name = "ac97", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ac97_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE (dev, AC97LinkState), > VMSTATE_UINT32 (glob_cnt, AC97LinkState), > VMSTATE_UINT32 (glob_sta, AC97LinkState), > diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c > index d19195a..6325a8c 100644 > --- a/hw/audio/cs4231.c > +++ b/hw/audio/cs4231.c > @@ -137,8 +137,7 @@ static const VMStateDescription vmstate_cs4231 = { > .name ="cs4231", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS), > VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS), > VMSTATE_END_OF_LIST() > diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c > index a0ec17a..f96f561 100644 > --- a/hw/audio/cs4231a.c > +++ b/hw/audio/cs4231a.c > @@ -621,10 +621,9 @@ static const VMStateDescription vmstate_cs4231a = { > .name = "cs4231a", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_load = cs4231a_pre_load, > .post_load = cs4231a_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32_ARRAY (regs, CSState, CS_REGS), > VMSTATE_BUFFER (dregs, CSState), > VMSTATE_INT32 (dma_running, CSState), > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index 1ec7ace..5dbf803 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -953,8 +953,7 @@ static const VMStateDescription vmstate_es1370_channel = { > .name = "es1370_channel", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (shift, struct chan), > VMSTATE_UINT32 (leftover, struct chan), > VMSTATE_UINT32 (scount, struct chan), > @@ -997,9 +996,8 @@ static const VMStateDescription vmstate_es1370 = { > .name = "es1370", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = es1370_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE (dev, ES1370State), > VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2, > vmstate_es1370_channel, struct chan), > diff --git a/hw/audio/gus.c b/hw/audio/gus.c > index e29a571..bba6840 100644 > --- a/hw/audio/gus.c > +++ b/hw/audio/gus.c > @@ -222,8 +222,7 @@ static const VMStateDescription vmstate_gus = { > .name = "gus", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32 (pos, GUSState), > VMSTATE_INT32 (left, GUSState), > VMSTATE_INT32 (shift, GUSState), > diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c > index a67ca91..09559ef 100644 > --- a/hw/audio/hda-codec.c > +++ b/hw/audio/hda-codec.c > @@ -580,7 +580,7 @@ static void hda_audio_reset(DeviceState *dev) > static const VMStateDescription vmstate_hda_audio_stream = { > .name = "hda-audio-stream", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(stream, HDAAudioStream), > VMSTATE_UINT32(channel, HDAAudioStream), > VMSTATE_UINT32(format, HDAAudioStream), > @@ -598,7 +598,7 @@ static const VMStateDescription vmstate_hda_audio = { > .name = "hda-audio", > .version_id = 2, > .post_load = hda_audio_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0, > vmstate_hda_audio_stream, > HDAAudioStream), > diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c > index d41f82c..1c660a4 100644 > --- a/hw/audio/intel-hda.c > +++ b/hw/audio/intel-hda.c > @@ -1175,7 +1175,7 @@ static int intel_hda_post_load(void *opaque, int version) > static const VMStateDescription vmstate_intel_hda_stream = { > .name = "intel-hda-stream", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(ctl, IntelHDAStream), > VMSTATE_UINT32(lpib, IntelHDAStream), > VMSTATE_UINT32(cbl, IntelHDAStream), > @@ -1191,7 +1191,7 @@ static const VMStateDescription vmstate_intel_hda = { > .name = "intel-hda", > .version_id = 1, > .post_load = intel_hda_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(pci, IntelHDAState), > > /* registers */ > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > index bb24e00..60c4b3b 100644 > --- a/hw/audio/sb16.c > +++ b/hw/audio/sb16.c > @@ -1289,9 +1289,8 @@ static const VMStateDescription vmstate_sb16 = { > .name = "sb16", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = sb16_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32 (irq, SB16State), > VMSTATE_UINT32 (dma, SB16State), > VMSTATE_UINT32 (hdma, SB16State), > diff --git a/hw/block/fdc.c b/hw/block/fdc.c > index 1651007..490d127 100644 > --- a/hw/block/fdc.c > +++ b/hw/block/fdc.c > @@ -672,8 +672,7 @@ static const VMStateDescription vmstate_fdrive_media_changed = { > .name = "fdrive/media_changed", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(media_changed, FDrive), > VMSTATE_END_OF_LIST() > } > @@ -690,8 +689,7 @@ static const VMStateDescription vmstate_fdrive_media_rate = { > .name = "fdrive/media_rate", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(media_rate, FDrive), > VMSTATE_END_OF_LIST() > } > @@ -701,8 +699,7 @@ static const VMStateDescription vmstate_fdrive = { > .name = "fdrive", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(head, FDrive), > VMSTATE_UINT8(track, FDrive), > VMSTATE_UINT8(sect, FDrive), > @@ -741,10 +738,9 @@ static const VMStateDescription vmstate_fdc = { > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .pre_save = fdc_pre_save, > .post_load = fdc_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > /* Controller State */ > VMSTATE_UINT8(sra, FDCtrl), > VMSTATE_UINT8(srb, FDCtrl), > @@ -2209,7 +2205,7 @@ static const VMStateDescription vmstate_isa_fdc ={ > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), > VMSTATE_END_OF_LIST() > } > @@ -2251,7 +2247,7 @@ static const VMStateDescription vmstate_sysbus_fdc ={ > .name = "fdc", > .version_id = 2, > .minimum_version_id = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c > index 991c99f..44f50c3 100644 > --- a/hw/char/serial-pci.c > +++ b/hw/char/serial-pci.c > @@ -155,7 +155,7 @@ static const VMStateDescription vmstate_pci_serial = { > .name = "pci-serial", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCISerialState), > VMSTATE_STRUCT(state, PCISerialState, 0, vmstate_serial, SerialState), > VMSTATE_END_OF_LIST() > @@ -166,7 +166,7 @@ static const VMStateDescription vmstate_pci_multi_serial = { > .name = "pci-serial-multi", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState), > VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS, > 0, vmstate_serial, SerialState), > diff --git a/hw/char/serial.c b/hw/char/serial.c > index f4d167f..d17da16 100644 > --- a/hw/char/serial.c > +++ b/hw/char/serial.c > @@ -602,7 +602,7 @@ const VMStateDescription vmstate_serial = { > .minimum_version_id = 2, > .pre_save = serial_pre_save, > .post_load = serial_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16_V(divider, SerialState, 2), > VMSTATE_UINT8(rbr, SerialState), > VMSTATE_UINT8(ier, SerialState), > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 0d3127d..55449a6 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -2702,9 +2702,8 @@ static const VMStateDescription vmstate_cirrus_vga = { > .name = "cirrus_vga", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = cirrus_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(vga.latch, CirrusVGAState), > VMSTATE_UINT8(vga.sr_index, CirrusVGAState), > VMSTATE_BUFFER(vga.sr, CirrusVGAState), > @@ -2742,8 +2741,7 @@ static const VMStateDescription vmstate_pci_cirrus_vga = { > .name = "cirrus_vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCICirrusVGAState), > VMSTATE_STRUCT(cirrus_vga, PCICirrusVGAState, 0, > vmstate_cirrus_vga, CirrusVGAState), > diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c > index 574ea0e..a2a9ca1 100644 > --- a/hw/display/vga-pci.c > +++ b/hw/display/vga-pci.c > @@ -54,8 +54,7 @@ static const VMStateDescription vmstate_vga_pci = { > .name = "vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCIVGAState), > VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common, VGACommonState), > VMSTATE_END_OF_LIST() > diff --git a/hw/display/vga.c b/hw/display/vga.c > index 063319d..9e35dd2 100644 > --- a/hw/display/vga.c > +++ b/hw/display/vga.c > @@ -2210,9 +2210,8 @@ const VMStateDescription vmstate_vga_common = { > .name = "vga", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = vga_common_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(latch, VGACommonState), > VMSTATE_UINT8(sr_index, VGACommonState), > VMSTATE_PARTIAL_BUFFER(sr, VGACommonState, 8), > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index 6ae3348..00bb385 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -1152,9 +1152,8 @@ static const VMStateDescription vmstate_vmware_vga_internal = { > .name = "vmware_vga_internal", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = vmsvga_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s), > VMSTATE_INT32(enable, struct vmsvga_state_s), > VMSTATE_INT32(config, struct vmsvga_state_s), > @@ -1179,8 +1178,7 @@ static const VMStateDescription vmstate_vmware_vga = { > .name = "vmware_vga", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, struct pci_vmsvga_state_s), > VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0, > vmstate_vmware_vga_internal, struct vmsvga_state_s), > diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c > index 4490372..dd370ed 100644 > --- a/hw/dma/i8257.c > +++ b/hw/dma/i8257.c > @@ -551,8 +551,7 @@ static const VMStateDescription vmstate_dma_regs = { > .name = "dma_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_ARRAY(now, struct dma_regs, 2), > VMSTATE_UINT16_ARRAY(base, struct dma_regs, 2), > VMSTATE_UINT8(mode, struct dma_regs), > @@ -575,9 +574,8 @@ static const VMStateDescription vmstate_dma = { > .name = "dma", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = dma_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(command, struct dma_cont), > VMSTATE_UINT8(mask, struct dma_cont), > VMSTATE_UINT8(flip_flop, struct dma_cont), > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index c98df88..faf5f4f 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1497,8 +1497,7 @@ static const VMStateDescription vmstate_acpi_build = { > .name = "acpi_build", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(patched, AcpiBuildState), > VMSTATE_END_OF_LIST() > }, > diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c > index 892aa02..07b9c0e 100644 > --- a/hw/i386/kvm/clock.c > +++ b/hw/i386/kvm/clock.c > @@ -102,7 +102,6 @@ static const VMStateDescription kvmclock_vmsd = { > .name = "kvmclock", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT64(clock, KVMClockState), > VMSTATE_END_OF_LIST() > diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c > index a1c3d1c..a730f4b 100644 > --- a/hw/i386/kvmvapic.c > +++ b/hw/i386/kvmvapic.c > @@ -773,7 +773,6 @@ static const VMStateDescription vmstate_handlers = { > .name = "kvmvapic-handlers", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT32(set_tpr, VAPICHandlers), > VMSTATE_UINT32(set_tpr_eax, VAPICHandlers), > @@ -787,7 +786,6 @@ static const VMStateDescription vmstate_guest_rom = { > .name = "kvmvapic-guest-rom", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UNUSED(8), /* signature */ > VMSTATE_UINT32(vaddr, GuestROMState), > @@ -807,7 +805,6 @@ static const VMStateDescription vmstate_vapic = { > .name = "kvm-tpr-opt", /* compatible with qemu-kvm VAPIC */ > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = vapic_post_load, > .fields = (VMStateField[]) { > VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 14f0d91..5155393 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -502,8 +502,7 @@ static const VMStateDescription vmstate_port92_isa = { > .name = "port92", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(outport, Port92State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > index bfe633f..a225181 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -1225,7 +1225,7 @@ void ahci_reset(AHCIState *s) > static const VMStateDescription vmstate_ahci_device = { > .name = "ahci port", > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_IDE_BUS(port, AHCIDevice), > VMSTATE_UINT32(port_state, AHCIDevice), > VMSTATE_UINT32(finished, AHCIDevice), > @@ -1284,7 +1284,7 @@ const VMStateDescription vmstate_ahci = { > .name = "ahci", > .version_id = 1, > .post_load = ahci_state_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports, > vmstate_ahci_device, AHCIDevice), > VMSTATE_UINT32(control_regs.cap, AHCIState), > @@ -1313,7 +1313,7 @@ typedef struct SysbusAHCIState { > static const VMStateDescription vmstate_sysbus_ahci = { > .name = "sysbus-ahci", > .unmigratable = 1, /* Still buggy under I/O load */ > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_AHCI(ahci, SysbusAHCIState), > VMSTATE_END_OF_LIST() > }, > diff --git a/hw/ide/ich.c b/hw/ide/ich.c > index 1c7c058..a2f1639 100644 > --- a/hw/ide/ich.c > +++ b/hw/ide/ich.c > @@ -83,7 +83,7 @@ static const VMStateDescription vmstate_ich9_ahci = { > .name = "ich9_ahci", > .unmigratable = 1, /* Still buggy under I/O load */ > .version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState), > VMSTATE_AHCI(ahci, AHCIPCIState), > VMSTATE_END_OF_LIST() > diff --git a/hw/ide/isa.c b/hw/ide/isa.c > index d2cabc1..4cbcb1c 100644 > --- a/hw/ide/isa.c > +++ b/hw/ide/isa.c > @@ -57,8 +57,7 @@ static const VMStateDescription vmstate_ide_isa = { > .name = "isa-ide", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_IDE_BUS(bus, ISAIDEState), > VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), > VMSTATE_END_OF_LIST() > diff --git a/hw/ide/pci.c b/hw/ide/pci.c > index d8b1157..6257a21 100644 > --- a/hw/ide/pci.c > +++ b/hw/ide/pci.c > @@ -411,8 +411,7 @@ static const VMStateDescription vmstate_bmdma_current = { > .name = "ide bmdma_current", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(cur_addr, BMDMAState), > VMSTATE_UINT32(cur_prd_last, BMDMAState), > VMSTATE_UINT32(cur_prd_addr, BMDMAState), > @@ -425,8 +424,7 @@ static const VMStateDescription vmstate_bmdma_status = { > .name ="ide bmdma/status", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(status, BMDMAState), > VMSTATE_END_OF_LIST() > } > @@ -436,9 +434,8 @@ static const VMStateDescription vmstate_bmdma = { > .name = "ide bmdma", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = ide_bmdma_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(cmd, BMDMAState), > VMSTATE_UINT8(migration_compat_status, BMDMAState), > VMSTATE_UINT32(addr, BMDMAState), > @@ -479,9 +476,8 @@ const VMStateDescription vmstate_ide_pci = { > .name = "ide", > .version_id = 3, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = ide_pci_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIIDEState), > VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, 0, > vmstate_bmdma, BMDMAState), > diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c > index 29af3d7..ca1cffc 100644 > --- a/hw/input/pckbd.c > +++ b/hw/input/pckbd.c > @@ -373,8 +373,7 @@ static const VMStateDescription vmstate_kbd = { > .name = "pckbd", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(write_cmd, KBDState), > VMSTATE_UINT8(status, KBDState), > VMSTATE_UINT8(mode, KBDState), > @@ -462,8 +461,7 @@ static const VMStateDescription vmstate_kbd_isa = { > .name = "pckbd", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(kbd, ISAKBDState, 0, vmstate_kbd, KBDState), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/input/ps2.c b/hw/input/ps2.c > index 3412079..0a0bd80 100644 > --- a/hw/input/ps2.c > +++ b/hw/input/ps2.c > @@ -559,8 +559,7 @@ static const VMStateDescription vmstate_ps2_common = { > .name = "PS2 Common State", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(write_cmd, PS2State), > VMSTATE_INT32(queue.rptr, PS2State), > VMSTATE_INT32(queue.wptr, PS2State), > @@ -589,9 +588,8 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = { > .name = "ps2kbd/ledstate", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ps2_kbd_ledstate_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(ledstate, PS2KbdState), > VMSTATE_END_OF_LIST() > } > @@ -610,9 +608,8 @@ static const VMStateDescription vmstate_ps2_keyboard = { > .name = "ps2kbd", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = ps2_kbd_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), > VMSTATE_INT32(scan_enabled, PS2KbdState), > VMSTATE_INT32(translate, PS2KbdState), > @@ -633,8 +630,7 @@ static const VMStateDescription vmstate_ps2_mouse = { > .name = "ps2mouse", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State), > VMSTATE_UINT8(mouse_status, PS2MouseState), > VMSTATE_UINT8(mouse_resolution, PS2MouseState), > diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c > index 6a50533..d7b1c76 100644 > --- a/hw/input/vmmouse.c > +++ b/hw/input/vmmouse.c > @@ -240,9 +240,8 @@ static const VMStateDescription vmstate_vmmouse = { > .name = "vmmouse", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = vmmouse_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(queue_size, VMMouseState), > VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), > VMSTATE_UINT16(nb_queue, VMMouseState), > diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c > index 61381c4..fbf26e5 100644 > --- a/hw/intc/i8259_common.c > +++ b/hw/intc/i8259_common.c > @@ -98,7 +98,6 @@ static const VMStateDescription vmstate_pic_common = { > .name = "i8259", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = pic_dispatch_pre_save, > .post_load = pic_dispatch_post_load, > .fields = (VMStateField[]) { > diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c > index 4d3d309..8b7d118 100644 > --- a/hw/intc/ioapic_common.c > +++ b/hw/intc/ioapic_common.c > @@ -86,7 +86,6 @@ static const VMStateDescription vmstate_ioapic_common = { > .name = "ioapic", > .version_id = 3, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = ioapic_dispatch_pre_save, > .post_load = ioapic_dispatch_post_load, > .fields = (VMStateField[]) { > diff --git a/hw/isa/apm.c b/hw/isa/apm.c > index f97e7a0..054d529 100644 > --- a/hw/isa/apm.c > +++ b/hw/isa/apm.c > @@ -72,7 +72,6 @@ const VMStateDescription vmstate_apm = { > .name = "APM State", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT8(apmc, APMState), > VMSTATE_UINT8(apms, APMState), > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index 51ce12d..97f69d6 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -616,7 +616,6 @@ static const VMStateDescription vmstate_ich9_lpc = { > .name = "ICH9LPC", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = ich9_lpc_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(d, ICH9LPCState), > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 492cd22..1aa17d7 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -76,8 +76,7 @@ static const VMStateDescription vmstate_piix4 = { > .name = "PIIX4", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PIIX4State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c > index 1a93afd..e0c235c 100644 > --- a/hw/isa/vt82c686.c > +++ b/hw/isa/vt82c686.c > @@ -230,9 +230,8 @@ static const VMStateDescription vmstate_acpi = { > .name = "vt82c686b_pm", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = vmstate_acpi_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, VT686PMState), > VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState), > VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState), > @@ -418,8 +417,7 @@ static const VMStateDescription vmstate_via = { > .name = "vt82c686b", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, VT82C686BState), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/net/e1000.c b/hw/net/e1000.c > index 8387443..a13b8c3 100644 > --- a/hw/net/e1000.c > +++ b/hw/net/e1000.c > @@ -1341,8 +1341,7 @@ static const VMStateDescription vmstate_e1000_mit_state = { > .name = "e1000/mit_state", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(mac_reg[RDTR], E1000State), > VMSTATE_UINT32(mac_reg[RADV], E1000State), > VMSTATE_UINT32(mac_reg[TADV], E1000State), > @@ -1356,10 +1355,9 @@ static const VMStateDescription vmstate_e1000 = { > .name = "e1000", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = e1000_pre_save, > .post_load = e1000_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, E1000State), > VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */ > VMSTATE_UNUSED(4), /* Was mmio_base. */ > diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c > index 3b891ca..aaa3ff2 100644 > --- a/hw/net/eepro100.c > +++ b/hw/net/eepro100.c > @@ -1784,8 +1784,7 @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size) > static const VMStateDescription vmstate_eepro100 = { > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, EEPRO100State), > VMSTATE_UNUSED(32), > VMSTATE_BUFFER(mult, EEPRO100State), > diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c > index c660e58..8740844 100644 > --- a/hw/net/ne2000-isa.c > +++ b/hw/net/ne2000-isa.c > @@ -59,8 +59,7 @@ static const VMStateDescription vmstate_isa_ne2000 = { > .name = "ne2000", > .version_id = 2, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(ne2000, ISANE2000State, 0, vmstate_ne2000, NE2000State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c > index 4c32e9e..d558b8c 100644 > --- a/hw/net/ne2000.c > +++ b/hw/net/ne2000.c > @@ -615,9 +615,8 @@ const VMStateDescription vmstate_ne2000 = { > .name = "ne2000", > .version_id = 2, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .post_load = ne2000_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8_V(rxcr, NE2000State, 2), > VMSTATE_UINT8(cmd, NE2000State), > VMSTATE_UINT32(start, NE2000State), > @@ -645,8 +644,7 @@ static const VMStateDescription vmstate_pci_ne2000 = { > .name = "ne2000", > .version_id = 3, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PCINE2000State), > VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State), > VMSTATE_END_OF_LIST() > diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c > index 6a5d806..b25d789 100644 > --- a/hw/net/pcnet-pci.c > +++ b/hw/net/pcnet-pci.c > @@ -241,8 +241,7 @@ static const VMStateDescription vmstate_pci_pcnet = { > .name = "pcnet", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIPCNetState), > VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), > VMSTATE_END_OF_LIST() > diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c > index 7cb47b3..8c54692 100644 > --- a/hw/net/pcnet.c > +++ b/hw/net/pcnet.c > @@ -1701,8 +1701,7 @@ const VMStateDescription vmstate_pcnet = { > .name = "pcnet", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32(rap, PCNetState), > VMSTATE_INT32(isr, PCNetState), > VMSTATE_INT32(lnkst, PCNetState), > diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c > index 5329f44..90bc5ec 100644 > --- a/hw/net/rtl8139.c > +++ b/hw/net/rtl8139.c > @@ -1358,8 +1358,7 @@ static const VMStateDescription vmstate_tally_counters = { > .name = "tally_counters", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(TxOk, RTL8139TallyCounters), > VMSTATE_UINT64(RxOk, RTL8139TallyCounters), > VMSTATE_UINT64(TxERR, RTL8139TallyCounters), > @@ -3271,8 +3270,7 @@ static const VMStateDescription vmstate_rtl8139_hotplug_ready ={ > .name = "rtl8139/hotplug_ready", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_END_OF_LIST() > } > }; > @@ -3293,10 +3291,9 @@ static const VMStateDescription vmstate_rtl8139 = { > .name = "rtl8139", > .version_id = 4, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > .post_load = rtl8139_post_load, > .pre_save = rtl8139_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, RTL8139State), > VMSTATE_PARTIAL_BUFFER(phys, RTL8139State, 6), > VMSTATE_BUFFER(mult, RTL8139State), > diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c > index ddcee4b..d8e8d59 100644 > --- a/hw/net/vmxnet3.c > +++ b/hw/net/vmxnet3.c > @@ -2223,7 +2223,6 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { > .name = "vmxnet3/mcast_list", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_load = vmxnet3_mcast_list_pre_load, > .fields = (VMStateField[]) { > VMSTATE_VBUFFER_UINT32(mcast_list, VMXNET3State, 0, NULL, 0, > @@ -2433,10 +2432,9 @@ static const VMStateDescription vmstate_vmxnet3 = { > .name = "vmxnet3", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = vmxnet3_pre_save, > .post_load = vmxnet3_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), > VMSTATE_BOOL(rx_packets_compound, VMXNET3State), > VMSTATE_BOOL(rx_vlan_stripping, VMXNET3State), > diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c > index a98f924..0af4d67 100644 > --- a/hw/nvram/eeprom93xx.c > +++ b/hw/nvram/eeprom93xx.c > @@ -125,8 +125,7 @@ static const VMStateDescription vmstate_eeprom = { > .name = "eeprom", > .version_id = EEPROM_VERSION, > .minimum_version_id = OLD_EEPROM_VERSION, > - .minimum_version_id_old = OLD_EEPROM_VERSION, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(tick, eeprom_t), > VMSTATE_UINT8(address, eeprom_t), > VMSTATE_UINT8(command, eeprom_t), > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 282341a..b71d251 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -377,8 +377,7 @@ static const VMStateDescription vmstate_fw_cfg = { > .name = "fw_cfg", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(cur_entry, FWCfgState), > VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), > VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), > diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c > index 0f7f209..f4e17ac 100644 > --- a/hw/pci-bridge/ioh3420.c > +++ b/hw/pci-bridge/ioh3420.c > @@ -184,7 +184,6 @@ static const VMStateDescription vmstate_ioh3420 = { > .name = "ioh-3240-express-root-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = pcie_cap_slot_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), > diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c > index 94f9781..8f22f93 100644 > --- a/hw/pci-bridge/xio3130_downstream.c > +++ b/hw/pci-bridge/xio3130_downstream.c > @@ -151,7 +151,6 @@ static const VMStateDescription vmstate_xio3130_downstream = { > .name = "xio3130-express-downstream-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = pcie_cap_slot_post_load, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), > diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c > index 59f97f6..eada582 100644 > --- a/hw/pci-bridge/xio3130_upstream.c > +++ b/hw/pci-bridge/xio3130_upstream.c > @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_xio3130_upstream = { > .name = "xio3130-express-upstream-port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), > VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index ffdc853..e0e0946 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -203,7 +203,7 @@ static const VMStateDescription vmstate_i440fx = { > .minimum_version_id_old = 1, > .load_state_old = i440fx_load_old, > .post_load = i440fx_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), > VMSTATE_UINT8(smm_enabled, PCII440FXState), > VMSTATE_END_OF_LIST() > @@ -553,7 +553,7 @@ static const VMStateDescription vmstate_piix3_rcr = { > .name = "PIIX3/rcr", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(rcr, PIIX3State), > VMSTATE_END_OF_LIST() > } > @@ -563,10 +563,9 @@ static const VMStateDescription vmstate_piix3 = { > .name = "PIIX3", > .version_id = 3, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .post_load = piix3_post_load, > .pre_save = piix3_pre_save, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, PIIX3State), > VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIX3State, > PIIX_NUM_PIRQS, 3), > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 8b8cc4e..571e523 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -330,9 +330,8 @@ static const VMStateDescription vmstate_mch = { > .name = "mch", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = mch_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState), > VMSTATE_UINT8(smm_enabled, MCHPCIState), > VMSTATE_END_OF_LIST() > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 2a9f08e..d4375b6 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -64,8 +64,7 @@ static const VMStateDescription vmstate_pcibus = { > .name = "PCIBUS", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_EQUAL(nirq, PCIBus), > VMSTATE_VARRAY_INT32(irq_count, PCIBus, > nirq, 0, vmstate_info_int32, > @@ -473,8 +472,7 @@ const VMStateDescription vmstate_pci_device = { > .name = "PCIDevice", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_LE(version_id, PCIDevice), > VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, > vmstate_info_pci_config, > @@ -490,8 +488,7 @@ const VMStateDescription vmstate_pcie_device = { > .name = "PCIEDevice", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_INT32_LE(version_id, PCIDevice), > VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, > vmstate_info_pci_config, > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index 991502e..090f307 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -784,8 +784,7 @@ static const VMStateDescription vmstate_pcie_aer_err = { > .name = "PCIE_AER_ERROR", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(status, PCIEAERErr), > VMSTATE_UINT16(source_id, PCIEAERErr), > VMSTATE_UINT16(flags, PCIEAERErr), > @@ -799,8 +798,7 @@ const VMStateDescription vmstate_pcie_aer_log = { > .name = "PCIE_AER_ERROR_LOG", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(log_num, PCIEAERLog), > VMSTATE_UINT16(log_max, PCIEAERLog), > VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num, > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > index cb30414..786d848 100644 > --- a/hw/scsi/lsi53c895a.c > +++ b/hw/scsi/lsi53c895a.c > @@ -1994,9 +1994,8 @@ static const VMStateDescription vmstate_lsi_scsi = { > .name = "lsiscsi", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = lsi_pre_save, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, LSIState), > > VMSTATE_INT32(carry, LSIState), > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index e6e1ffd..c735c08 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -2065,8 +2065,7 @@ static const VMStateDescription vmstate_megasas = { > .name = "megasas", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, MegasasState), > > VMSTATE_INT32(fw_state, MegasasState), > diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c > index ae921a6..a137c98 100644 > --- a/hw/scsi/scsi-bus.c > +++ b/hw/scsi/scsi-bus.c > @@ -1915,8 +1915,7 @@ static const VMStateDescription vmstate_scsi_sense_state = { > .name = "SCSIDevice/sense", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, > SCSI_SENSE_BUF_SIZE_OLD, > SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD), > @@ -1928,7 +1927,6 @@ const VMStateDescription vmstate_scsi_device = { > .name = "SCSIDevice", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT8(unit_attention.key, SCSIDevice), > VMSTATE_UINT8(unit_attention.asc, SCSIDevice), > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 48a28ae..f05c772 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2571,7 +2571,6 @@ static const VMStateDescription vmstate_scsi_disk_state = { > .name = "scsi-disk", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_SCSI_DEVICE(qdev, SCSIDiskState), > VMSTATE_BOOL(media_changed, SCSIDiskState), > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > index e35bff7..f9ed926 100644 > --- a/hw/scsi/vmw_pvscsi.c > +++ b/hw/scsi/vmw_pvscsi.c > @@ -1143,10 +1143,9 @@ static const VMStateDescription vmstate_pvscsi = { > .name = "pvscsi", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > .pre_save = pvscsi_pre_save, > .post_load = pvscsi_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), > VMSTATE_UINT8(msi_used, PVSCSIState), > VMSTATE_UINT32(resetting, PVSCSIState), > diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c > index e15d6bc..fa590e3 100644 > --- a/hw/timer/hpet.c > +++ b/hw/timer/hpet.c > @@ -270,8 +270,7 @@ static const VMStateDescription vmstate_hpet_rtc_irq_level = { > .name = "hpet/rtc_irq_level", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(rtc_irq_level, HPETState), > VMSTATE_END_OF_LIST() > } > @@ -281,8 +280,7 @@ static const VMStateDescription vmstate_hpet_timer = { > .name = "hpet_timer", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(tn, HPETTimer), > VMSTATE_UINT64(config, HPETTimer), > VMSTATE_UINT64(cmp, HPETTimer), > @@ -298,11 +296,10 @@ static const VMStateDescription vmstate_hpet = { > .name = "hpet", > .version_id = 2, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .pre_save = hpet_pre_save, > .pre_load = hpet_pre_load, > .post_load = hpet_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(config, HPETState), > VMSTATE_UINT64(isr, HPETState), > VMSTATE_UINT64(hpet_counter, HPETState), > diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c > index 9db5c9d..07345f6 100644 > --- a/hw/timer/i8254_common.c > +++ b/hw/timer/i8254_common.c > @@ -180,7 +180,6 @@ static const VMStateDescription vmstate_pit_channel = { > .name = "pit channel", > .version_id = 2, > .minimum_version_id = 2, > - .minimum_version_id_old = 2, > .fields = (VMStateField[]) { > VMSTATE_INT32(count, PITChannelState), > VMSTATE_UINT16(latched_count, PITChannelState), > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index 8509309..1822af2 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -720,9 +720,8 @@ static const VMStateDescription vmstate_rtc = { > .name = "mc146818rtc", > .version_id = 3, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = rtc_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_BUFFER(cmos_data, RTCState), > VMSTATE_UINT8(cmos_index, RTCState), > VMSTATE_UNUSED(7*4), > diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c > index 36d3887..b3d6f39 100644 > --- a/hw/watchdog/wdt_i6300esb.c > +++ b/hw/watchdog/wdt_i6300esb.c > @@ -379,18 +379,18 @@ static const VMStateDescription vmstate_i6300esb = { > * version_id to be set for every build. This eventually broke > * migration. > * > - * To correct this without breaking old->new migration for older versions > - * of QEMU, we've set version_id to a value high enough to exceed all past > - * values of sizeof(I6300State) across various build environments, and have > - * reset minimum_version_id_old/minimum_version_id to 1, since this VMSD > - * has never changed and thus can accept all past versions. > + * To correct this without breaking old->new migration for older > + * versions of QEMU, we've set version_id to a value high enough > + * to exceed all past values of sizeof(I6300State) across various > + * build environments, and have reset minimum_version_id to 1, > + * since this VMSD has never changed and thus can accept all past > + * versions. > * > * For future changes we can treat these values as we normally would. > */ > .version_id = 10000, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, I6300State), > VMSTATE_INT32(reboot_enabled, I6300State), > VMSTATE_INT32(clock_scale, I6300State), > diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c > index bc994a4..99bd7ea 100644 > --- a/hw/watchdog/wdt_ib700.c > +++ b/hw/watchdog/wdt_ib700.c > @@ -90,8 +90,7 @@ static const VMStateDescription vmstate_ib700 = { > .name = "ib700_wdt", > .version_id = 0, > .minimum_version_id = 0, > - .minimum_version_id_old = 0, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_TIMER(timer, IB700State), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c > index 1d9d0e9..8bb18b4 100644 > --- a/hw/xen/xen_platform.c > +++ b/hw/xen/xen_platform.c > @@ -375,9 +375,8 @@ static const VMStateDescription vmstate_xen_platform = { > .name = "platform", > .version_id = 4, > .minimum_version_id = 4, > - .minimum_version_id_old = 4, > .post_load = xen_platform_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(parent_obj, PCIXenPlatformState), > VMSTATE_UINT8(flags, PCIXenPlatformState), > VMSTATE_END_OF_LIST() > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 168cab6..fe3f024 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -10,8 +10,7 @@ static const VMStateDescription vmstate_segment = { > .name = "segment", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT32(selector, SegmentCache), > VMSTATE_UINTTL(base, SegmentCache), > VMSTATE_UINT32(limit, SegmentCache), > @@ -36,8 +35,7 @@ static const VMStateDescription vmstate_xmm_reg = { > .name = "xmm_reg", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(XMM_Q(0), XMMReg), > VMSTATE_UINT64(XMM_Q(1), XMMReg), > VMSTATE_END_OF_LIST() > @@ -52,8 +50,7 @@ static const VMStateDescription vmstate_ymmh_reg = { > .name = "ymmh_reg", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(XMM_Q(0), XMMReg), > VMSTATE_UINT64(XMM_Q(1), XMMReg), > VMSTATE_END_OF_LIST() > @@ -67,8 +64,7 @@ static const VMStateDescription vmstate_bnd_regs = { > .name = "bnd_regs", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(lb, BNDReg), > VMSTATE_UINT64(ub, BNDReg), > VMSTATE_END_OF_LIST() > @@ -82,8 +78,7 @@ static const VMStateDescription vmstate_mtrr_var = { > .name = "mtrr_var", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(base, MTRRVar), > VMSTATE_UINT64(mask, MTRRVar), > VMSTATE_END_OF_LIST() > @@ -355,8 +350,7 @@ static const VMStateDescription vmstate_steal_time_msr = { > .name = "cpu/steal_time_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.steal_time_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -366,8 +360,7 @@ static const VMStateDescription vmstate_async_pf_msr = { > .name = "cpu/async_pf_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.async_pf_en_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -377,8 +370,7 @@ static const VMStateDescription vmstate_pv_eoi_msr = { > .name = "cpu/async_pv_eoi_msr", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.pv_eoi_en_msr, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -396,8 +388,7 @@ static const VMStateDescription vmstate_fpop_ip_dp = { > .name = "cpu/fpop_ip_dp", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(env.fpop, X86CPU), > VMSTATE_UINT64(env.fpip, X86CPU), > VMSTATE_UINT64(env.fpdp, X86CPU), > @@ -417,8 +408,7 @@ static const VMStateDescription vmstate_msr_tsc_adjust = { > .name = "cpu/msr_tsc_adjust", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.tsc_adjust, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -436,8 +426,7 @@ static const VMStateDescription vmstate_msr_tscdeadline = { > .name = "cpu/msr_tscdeadline", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.tsc_deadline, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -463,8 +452,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = { > .name = "cpu/msr_ia32_misc_enable", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_ia32_misc_enable, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -474,8 +462,7 @@ static const VMStateDescription vmstate_msr_ia32_feature_control = { > .name = "cpu/msr_ia32_feature_control", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_ia32_feature_control, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -509,8 +496,7 @@ static const VMStateDescription vmstate_msr_architectural_pmu = { > .name = "cpu/msr_architectural_pmu", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_fixed_ctr_ctrl, X86CPU), > VMSTATE_UINT64(env.msr_global_ctrl, X86CPU), > VMSTATE_UINT64(env.msr_global_status, X86CPU), > @@ -545,8 +531,7 @@ static const VMStateDescription vmstate_mpx = { > .name = "cpu/mpx", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_BND_REGS(env.bnd_regs, X86CPU, 4), > VMSTATE_UINT64(env.bndcs_regs.cfgu, X86CPU), > VMSTATE_UINT64(env.bndcs_regs.sts, X86CPU), > @@ -567,8 +552,7 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { > .name = "cpu/msr_hyperv_hypercall", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), > VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_END_OF_LIST() > @@ -587,8 +571,7 @@ static const VMStateDescription vmstate_msr_hyperv_vapic = { > .name = "cpu/msr_hyperv_vapic", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_vapic, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -606,8 +589,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = { > .name = "cpu/msr_hyperv_time", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT64(env.msr_hv_tsc, X86CPU), > VMSTATE_END_OF_LIST() > } > @@ -617,10 +599,9 @@ const VMStateDescription vmstate_x86_cpu = { > .name = "cpu", > .version_id = 12, > .minimum_version_id = 3, > - .minimum_version_id_old = 3, > .pre_save = cpu_pre_save, > .post_load = cpu_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINTTL_ARRAY(env.regs, X86CPU, CPU_NB_REGS), > VMSTATE_UINTTL(env.eip, X86CPU), > VMSTATE_UINTTL(env.eflags, X86CPU), > -- > 1.9.0 >
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 0afac42..407ae89 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -143,7 +143,6 @@ const VMStateDescription vmstate_ich9_pm = { .name = "ich9_pm", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = ich9_pm_post_load, .fields = (VMStateField[]) { VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs), diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index f80c480..d807cf1 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -322,8 +322,7 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name = "acpi_pcihp_pci_status", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(up, AcpiPciHpPciStatus), VMSTATE_UINT32(down, AcpiPciHpPciStatus), VMSTATE_END_OF_LIST() diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 67dc075..252bbf2 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -177,8 +177,7 @@ static const VMStateDescription vmstate_gpe = { .name = "gpe", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_GPE_ARRAY(sts, ACPIGPE), VMSTATE_GPE_ARRAY(en, ACPIGPE), VMSTATE_END_OF_LIST() @@ -189,8 +188,7 @@ static const VMStateDescription vmstate_pci_status = { .name = "pci_status", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(up, struct AcpiPciHpPciStatus), VMSTATE_UINT32(down, struct AcpiPciHpPciStatus), VMSTATE_END_OF_LIST() @@ -259,7 +257,7 @@ static const VMStateDescription vmstate_acpi = { .minimum_version_id_old = 1, .load_state_old = acpi_load_old, .post_load = vmstate_acpi_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), VMSTATE_UINT16(ar.pm1.evt.sts, PIIX4PMState), VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 03f4846..45cb118 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1163,8 +1163,7 @@ static const VMStateDescription vmstate_ac97_bm_regs = { .name = "ac97_bm_regs", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32 (bdbar, AC97BusMasterRegs), VMSTATE_UINT8 (civ, AC97BusMasterRegs), VMSTATE_UINT8 (lvi, AC97BusMasterRegs), @@ -1211,9 +1210,8 @@ static const VMStateDescription vmstate_ac97 = { .name = "ac97", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ac97_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE (dev, AC97LinkState), VMSTATE_UINT32 (glob_cnt, AC97LinkState), VMSTATE_UINT32 (glob_sta, AC97LinkState), diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index d19195a..6325a8c 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -137,8 +137,7 @@ static const VMStateDescription vmstate_cs4231 = { .name ="cs4231", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS), VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS), VMSTATE_END_OF_LIST() diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index a0ec17a..f96f561 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -621,10 +621,9 @@ static const VMStateDescription vmstate_cs4231a = { .name = "cs4231a", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_load = cs4231a_pre_load, .post_load = cs4231a_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY (regs, CSState, CS_REGS), VMSTATE_BUFFER (dregs, CSState), VMSTATE_INT32 (dma_running, CSState), diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 1ec7ace..5dbf803 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -953,8 +953,7 @@ static const VMStateDescription vmstate_es1370_channel = { .name = "es1370_channel", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32 (shift, struct chan), VMSTATE_UINT32 (leftover, struct chan), VMSTATE_UINT32 (scount, struct chan), @@ -997,9 +996,8 @@ static const VMStateDescription vmstate_es1370 = { .name = "es1370", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = es1370_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE (dev, ES1370State), VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2, vmstate_es1370_channel, struct chan), diff --git a/hw/audio/gus.c b/hw/audio/gus.c index e29a571..bba6840 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -222,8 +222,7 @@ static const VMStateDescription vmstate_gus = { .name = "gus", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32 (pos, GUSState), VMSTATE_INT32 (left, GUSState), VMSTATE_INT32 (shift, GUSState), diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index a67ca91..09559ef 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -580,7 +580,7 @@ static void hda_audio_reset(DeviceState *dev) static const VMStateDescription vmstate_hda_audio_stream = { .name = "hda-audio-stream", .version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(stream, HDAAudioStream), VMSTATE_UINT32(channel, HDAAudioStream), VMSTATE_UINT32(format, HDAAudioStream), @@ -598,7 +598,7 @@ static const VMStateDescription vmstate_hda_audio = { .name = "hda-audio", .version_id = 2, .post_load = hda_audio_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0, vmstate_hda_audio_stream, HDAAudioStream), diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index d41f82c..1c660a4 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -1175,7 +1175,7 @@ static int intel_hda_post_load(void *opaque, int version) static const VMStateDescription vmstate_intel_hda_stream = { .name = "intel-hda-stream", .version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(ctl, IntelHDAStream), VMSTATE_UINT32(lpib, IntelHDAStream), VMSTATE_UINT32(cbl, IntelHDAStream), @@ -1191,7 +1191,7 @@ static const VMStateDescription vmstate_intel_hda = { .name = "intel-hda", .version_id = 1, .post_load = intel_hda_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(pci, IntelHDAState), /* registers */ diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bb24e00..60c4b3b 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1289,9 +1289,8 @@ static const VMStateDescription vmstate_sb16 = { .name = "sb16", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = sb16_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32 (irq, SB16State), VMSTATE_UINT32 (dma, SB16State), VMSTATE_UINT32 (hdma, SB16State), diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 1651007..490d127 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -672,8 +672,7 @@ static const VMStateDescription vmstate_fdrive_media_changed = { .name = "fdrive/media_changed", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(media_changed, FDrive), VMSTATE_END_OF_LIST() } @@ -690,8 +689,7 @@ static const VMStateDescription vmstate_fdrive_media_rate = { .name = "fdrive/media_rate", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(media_rate, FDrive), VMSTATE_END_OF_LIST() } @@ -701,8 +699,7 @@ static const VMStateDescription vmstate_fdrive = { .name = "fdrive", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(head, FDrive), VMSTATE_UINT8(track, FDrive), VMSTATE_UINT8(sect, FDrive), @@ -741,10 +738,9 @@ static const VMStateDescription vmstate_fdc = { .name = "fdc", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .pre_save = fdc_pre_save, .post_load = fdc_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { /* Controller State */ VMSTATE_UINT8(sra, FDCtrl), VMSTATE_UINT8(srb, FDCtrl), @@ -2209,7 +2205,7 @@ static const VMStateDescription vmstate_isa_fdc ={ .name = "fdc", .version_id = 2, .minimum_version_id = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), VMSTATE_END_OF_LIST() } @@ -2251,7 +2247,7 @@ static const VMStateDescription vmstate_sysbus_fdc ={ .name = "fdc", .version_id = 2, .minimum_version_id = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), VMSTATE_END_OF_LIST() } diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 991c99f..44f50c3 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -155,7 +155,7 @@ static const VMStateDescription vmstate_pci_serial = { .name = "pci-serial", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCISerialState), VMSTATE_STRUCT(state, PCISerialState, 0, vmstate_serial, SerialState), VMSTATE_END_OF_LIST() @@ -166,7 +166,7 @@ static const VMStateDescription vmstate_pci_multi_serial = { .name = "pci-serial-multi", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState), VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS, 0, vmstate_serial, SerialState), diff --git a/hw/char/serial.c b/hw/char/serial.c index f4d167f..d17da16 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -602,7 +602,7 @@ const VMStateDescription vmstate_serial = { .minimum_version_id = 2, .pre_save = serial_pre_save, .post_load = serial_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT16_V(divider, SerialState, 2), VMSTATE_UINT8(rbr, SerialState), VMSTATE_UINT8(ier, SerialState), diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 0d3127d..55449a6 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2702,9 +2702,8 @@ static const VMStateDescription vmstate_cirrus_vga = { .name = "cirrus_vga", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = cirrus_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(vga.latch, CirrusVGAState), VMSTATE_UINT8(vga.sr_index, CirrusVGAState), VMSTATE_BUFFER(vga.sr, CirrusVGAState), @@ -2742,8 +2741,7 @@ static const VMStateDescription vmstate_pci_cirrus_vga = { .name = "cirrus_vga", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCICirrusVGAState), VMSTATE_STRUCT(cirrus_vga, PCICirrusVGAState, 0, vmstate_cirrus_vga, CirrusVGAState), diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 574ea0e..a2a9ca1 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -54,8 +54,7 @@ static const VMStateDescription vmstate_vga_pci = { .name = "vga", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCIVGAState), VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common, VGACommonState), VMSTATE_END_OF_LIST() diff --git a/hw/display/vga.c b/hw/display/vga.c index 063319d..9e35dd2 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2210,9 +2210,8 @@ const VMStateDescription vmstate_vga_common = { .name = "vga", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = vga_common_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(latch, VGACommonState), VMSTATE_UINT8(sr_index, VGACommonState), VMSTATE_PARTIAL_BUFFER(sr, VGACommonState, 8), diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 6ae3348..00bb385 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1152,9 +1152,8 @@ static const VMStateDescription vmstate_vmware_vga_internal = { .name = "vmware_vga_internal", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, .post_load = vmsvga_post_load, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s), VMSTATE_INT32(enable, struct vmsvga_state_s), VMSTATE_INT32(config, struct vmsvga_state_s), @@ -1179,8 +1178,7 @@ static const VMStateDescription vmstate_vmware_vga = { .name = "vmware_vga", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, struct pci_vmsvga_state_s), VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0, vmstate_vmware_vga_internal, struct vmsvga_state_s), diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 4490372..dd370ed 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -551,8 +551,7 @@ static const VMStateDescription vmstate_dma_regs = { .name = "dma_regs", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32_ARRAY(now, struct dma_regs, 2), VMSTATE_UINT16_ARRAY(base, struct dma_regs, 2), VMSTATE_UINT8(mode, struct dma_regs), @@ -575,9 +574,8 @@ static const VMStateDescription vmstate_dma = { .name = "dma", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = dma_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(command, struct dma_cont), VMSTATE_UINT8(mask, struct dma_cont), VMSTATE_UINT8(flip_flop, struct dma_cont), diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c98df88..faf5f4f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1497,8 +1497,7 @@ static const VMStateDescription vmstate_acpi_build = { .name = "acpi_build", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(patched, AcpiBuildState), VMSTATE_END_OF_LIST() }, diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 892aa02..07b9c0e 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -102,7 +102,6 @@ static const VMStateDescription kvmclock_vmsd = { .name = "kvmclock", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_UINT64(clock, KVMClockState), VMSTATE_END_OF_LIST() diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index a1c3d1c..a730f4b 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -773,7 +773,6 @@ static const VMStateDescription vmstate_handlers = { .name = "kvmvapic-handlers", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_UINT32(set_tpr, VAPICHandlers), VMSTATE_UINT32(set_tpr_eax, VAPICHandlers), @@ -787,7 +786,6 @@ static const VMStateDescription vmstate_guest_rom = { .name = "kvmvapic-guest-rom", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_UNUSED(8), /* signature */ VMSTATE_UINT32(vaddr, GuestROMState), @@ -807,7 +805,6 @@ static const VMStateDescription vmstate_vapic = { .name = "kvm-tpr-opt", /* compatible with qemu-kvm VAPIC */ .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = vapic_post_load, .fields = (VMStateField[]) { VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 14f0d91..5155393 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -502,8 +502,7 @@ static const VMStateDescription vmstate_port92_isa = { .name = "port92", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(outport, Port92State), VMSTATE_END_OF_LIST() } diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index bfe633f..a225181 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1225,7 +1225,7 @@ void ahci_reset(AHCIState *s) static const VMStateDescription vmstate_ahci_device = { .name = "ahci port", .version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_IDE_BUS(port, AHCIDevice), VMSTATE_UINT32(port_state, AHCIDevice), VMSTATE_UINT32(finished, AHCIDevice), @@ -1284,7 +1284,7 @@ const VMStateDescription vmstate_ahci = { .name = "ahci", .version_id = 1, .post_load = ahci_state_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports, vmstate_ahci_device, AHCIDevice), VMSTATE_UINT32(control_regs.cap, AHCIState), @@ -1313,7 +1313,7 @@ typedef struct SysbusAHCIState { static const VMStateDescription vmstate_sysbus_ahci = { .name = "sysbus-ahci", .unmigratable = 1, /* Still buggy under I/O load */ - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_AHCI(ahci, SysbusAHCIState), VMSTATE_END_OF_LIST() }, diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 1c7c058..a2f1639 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -83,7 +83,7 @@ static const VMStateDescription vmstate_ich9_ahci = { .name = "ich9_ahci", .unmigratable = 1, /* Still buggy under I/O load */ .version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState), VMSTATE_AHCI(ahci, AHCIPCIState), VMSTATE_END_OF_LIST() diff --git a/hw/ide/isa.c b/hw/ide/isa.c index d2cabc1..4cbcb1c 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -57,8 +57,7 @@ static const VMStateDescription vmstate_ide_isa = { .name = "isa-ide", .version_id = 3, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_IDE_BUS(bus, ISAIDEState), VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), VMSTATE_END_OF_LIST() diff --git a/hw/ide/pci.c b/hw/ide/pci.c index d8b1157..6257a21 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -411,8 +411,7 @@ static const VMStateDescription vmstate_bmdma_current = { .name = "ide bmdma_current", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(cur_addr, BMDMAState), VMSTATE_UINT32(cur_prd_last, BMDMAState), VMSTATE_UINT32(cur_prd_addr, BMDMAState), @@ -425,8 +424,7 @@ static const VMStateDescription vmstate_bmdma_status = { .name ="ide bmdma/status", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(status, BMDMAState), VMSTATE_END_OF_LIST() } @@ -436,9 +434,8 @@ static const VMStateDescription vmstate_bmdma = { .name = "ide bmdma", .version_id = 3, .minimum_version_id = 0, - .minimum_version_id_old = 0, .pre_save = ide_bmdma_pre_save, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(cmd, BMDMAState), VMSTATE_UINT8(migration_compat_status, BMDMAState), VMSTATE_UINT32(addr, BMDMAState), @@ -479,9 +476,8 @@ const VMStateDescription vmstate_ide_pci = { .name = "ide", .version_id = 3, .minimum_version_id = 0, - .minimum_version_id_old = 0, .post_load = ide_pci_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIIDEState), VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, 0, vmstate_bmdma, BMDMAState), diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 29af3d7..ca1cffc 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -373,8 +373,7 @@ static const VMStateDescription vmstate_kbd = { .name = "pckbd", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(write_cmd, KBDState), VMSTATE_UINT8(status, KBDState), VMSTATE_UINT8(mode, KBDState), @@ -462,8 +461,7 @@ static const VMStateDescription vmstate_kbd_isa = { .name = "pckbd", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(kbd, ISAKBDState, 0, vmstate_kbd, KBDState), VMSTATE_END_OF_LIST() } diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 3412079..0a0bd80 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -559,8 +559,7 @@ static const VMStateDescription vmstate_ps2_common = { .name = "PS2 Common State", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32(write_cmd, PS2State), VMSTATE_INT32(queue.rptr, PS2State), VMSTATE_INT32(queue.wptr, PS2State), @@ -589,9 +588,8 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = { .name = "ps2kbd/ledstate", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ps2_kbd_ledstate_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32(ledstate, PS2KbdState), VMSTATE_END_OF_LIST() } @@ -610,9 +608,8 @@ static const VMStateDescription vmstate_ps2_keyboard = { .name = "ps2kbd", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ps2_kbd_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), VMSTATE_INT32(scan_enabled, PS2KbdState), VMSTATE_INT32(translate, PS2KbdState), @@ -633,8 +630,7 @@ static const VMStateDescription vmstate_ps2_mouse = { .name = "ps2mouse", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State), VMSTATE_UINT8(mouse_status, PS2MouseState), VMSTATE_UINT8(mouse_resolution, PS2MouseState), diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c index 6a50533..d7b1c76 100644 --- a/hw/input/vmmouse.c +++ b/hw/input/vmmouse.c @@ -240,9 +240,8 @@ static const VMStateDescription vmstate_vmmouse = { .name = "vmmouse", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, .post_load = vmmouse_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32_EQUAL(queue_size, VMMouseState), VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), VMSTATE_UINT16(nb_queue, VMMouseState), diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index 61381c4..fbf26e5 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -98,7 +98,6 @@ static const VMStateDescription vmstate_pic_common = { .name = "i8259", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = pic_dispatch_pre_save, .post_load = pic_dispatch_post_load, .fields = (VMStateField[]) { diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index 4d3d309..8b7d118 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -86,7 +86,6 @@ static const VMStateDescription vmstate_ioapic_common = { .name = "ioapic", .version_id = 3, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = ioapic_dispatch_pre_save, .post_load = ioapic_dispatch_post_load, .fields = (VMStateField[]) { diff --git a/hw/isa/apm.c b/hw/isa/apm.c index f97e7a0..054d529 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -72,7 +72,6 @@ const VMStateDescription vmstate_apm = { .name = "APM State", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_UINT8(apmc, APMState), VMSTATE_UINT8(apms, APMState), diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 51ce12d..97f69d6 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -616,7 +616,6 @@ static const VMStateDescription vmstate_ich9_lpc = { .name = "ICH9LPC", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = ich9_lpc_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(d, ICH9LPCState), diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 492cd22..1aa17d7 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -76,8 +76,7 @@ static const VMStateDescription vmstate_piix4 = { .name = "PIIX4", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIX4State), VMSTATE_END_OF_LIST() } diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1a93afd..e0c235c 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -230,9 +230,8 @@ static const VMStateDescription vmstate_acpi = { .name = "vt82c686b_pm", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = vmstate_acpi_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, VT686PMState), VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState), VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState), @@ -418,8 +417,7 @@ static const VMStateDescription vmstate_via = { .name = "vt82c686b", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, VT82C686BState), VMSTATE_END_OF_LIST() } diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 8387443..a13b8c3 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1341,8 +1341,7 @@ static const VMStateDescription vmstate_e1000_mit_state = { .name = "e1000/mit_state", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT32(mac_reg[RDTR], E1000State), VMSTATE_UINT32(mac_reg[RADV], E1000State), VMSTATE_UINT32(mac_reg[TADV], E1000State), @@ -1356,10 +1355,9 @@ static const VMStateDescription vmstate_e1000 = { .name = "e1000", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = e1000_pre_save, .post_load = e1000_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, E1000State), VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */ VMSTATE_UNUSED(4), /* Was mmio_base. */ diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 3b891ca..aaa3ff2 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1784,8 +1784,7 @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size) static const VMStateDescription vmstate_eepro100 = { .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, EEPRO100State), VMSTATE_UNUSED(32), VMSTATE_BUFFER(mult, EEPRO100State), diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index c660e58..8740844 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -59,8 +59,7 @@ static const VMStateDescription vmstate_isa_ne2000 = { .name = "ne2000", .version_id = 2, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(ne2000, ISANE2000State, 0, vmstate_ne2000, NE2000State), VMSTATE_END_OF_LIST() } diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 4c32e9e..d558b8c 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -615,9 +615,8 @@ const VMStateDescription vmstate_ne2000 = { .name = "ne2000", .version_id = 2, .minimum_version_id = 0, - .minimum_version_id_old = 0, .post_load = ne2000_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8_V(rxcr, NE2000State, 2), VMSTATE_UINT8(cmd, NE2000State), VMSTATE_UINT32(start, NE2000State), @@ -645,8 +644,7 @@ static const VMStateDescription vmstate_pci_ne2000 = { .name = "ne2000", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCINE2000State), VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State), VMSTATE_END_OF_LIST() diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 6a5d806..b25d789 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -241,8 +241,7 @@ static const VMStateDescription vmstate_pci_pcnet = { .name = "pcnet", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIPCNetState), VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), VMSTATE_END_OF_LIST() diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 7cb47b3..8c54692 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1701,8 +1701,7 @@ const VMStateDescription vmstate_pcnet = { .name = "pcnet", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32(rap, PCNetState), VMSTATE_INT32(isr, PCNetState), VMSTATE_INT32(lnkst, PCNetState), diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 5329f44..90bc5ec 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -1358,8 +1358,7 @@ static const VMStateDescription vmstate_tally_counters = { .name = "tally_counters", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(TxOk, RTL8139TallyCounters), VMSTATE_UINT64(RxOk, RTL8139TallyCounters), VMSTATE_UINT64(TxERR, RTL8139TallyCounters), @@ -3271,8 +3270,7 @@ static const VMStateDescription vmstate_rtl8139_hotplug_ready ={ .name = "rtl8139/hotplug_ready", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_END_OF_LIST() } }; @@ -3293,10 +3291,9 @@ static const VMStateDescription vmstate_rtl8139 = { .name = "rtl8139", .version_id = 4, .minimum_version_id = 3, - .minimum_version_id_old = 3, .post_load = rtl8139_post_load, .pre_save = rtl8139_pre_save, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, RTL8139State), VMSTATE_PARTIAL_BUFFER(phys, RTL8139State, 6), VMSTATE_BUFFER(mult, RTL8139State), diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index ddcee4b..d8e8d59 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2223,7 +2223,6 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { .name = "vmxnet3/mcast_list", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_load = vmxnet3_mcast_list_pre_load, .fields = (VMStateField[]) { VMSTATE_VBUFFER_UINT32(mcast_list, VMXNET3State, 0, NULL, 0, @@ -2433,10 +2432,9 @@ static const VMStateDescription vmstate_vmxnet3 = { .name = "vmxnet3", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = vmxnet3_pre_save, .post_load = vmxnet3_post_load, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), VMSTATE_BOOL(rx_packets_compound, VMXNET3State), VMSTATE_BOOL(rx_vlan_stripping, VMXNET3State), diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index a98f924..0af4d67 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -125,8 +125,7 @@ static const VMStateDescription vmstate_eeprom = { .name = "eeprom", .version_id = EEPROM_VERSION, .minimum_version_id = OLD_EEPROM_VERSION, - .minimum_version_id_old = OLD_EEPROM_VERSION, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(tick, eeprom_t), VMSTATE_UINT8(address, eeprom_t), VMSTATE_UINT8(command, eeprom_t), diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 282341a..b71d251 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -377,8 +377,7 @@ static const VMStateDescription vmstate_fw_cfg = { .name = "fw_cfg", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT16(cur_entry, FWCfgState), VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 0f7f209..f4e17ac 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -184,7 +184,6 @@ static const VMStateDescription vmstate_ioh3420 = { .name = "ioh-3240-express-root-port", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = pcie_cap_slot_post_load, .fields = (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index 94f9781..8f22f93 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -151,7 +151,6 @@ static const VMStateDescription vmstate_xio3130_downstream = { .name = "xio3130-express-downstream-port", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = pcie_cap_slot_post_load, .fields = (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index 59f97f6..eada582 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_xio3130_upstream = { .name = "xio3130-express-upstream-port", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index ffdc853..e0e0946 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -203,7 +203,7 @@ static const VMStateDescription vmstate_i440fx = { .minimum_version_id_old = 1, .load_state_old = i440fx_load_old, .post_load = i440fx_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), VMSTATE_UINT8(smm_enabled, PCII440FXState), VMSTATE_END_OF_LIST() @@ -553,7 +553,7 @@ static const VMStateDescription vmstate_piix3_rcr = { .name = "PIIX3/rcr", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(rcr, PIIX3State), VMSTATE_END_OF_LIST() } @@ -563,10 +563,9 @@ static const VMStateDescription vmstate_piix3 = { .name = "PIIX3", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = piix3_post_load, .pre_save = piix3_pre_save, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIX3State), VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIX3State, PIIX_NUM_PIRQS, 3), diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 8b8cc4e..571e523 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -330,9 +330,8 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = mch_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState), VMSTATE_UINT8(smm_enabled, MCHPCIState), VMSTATE_END_OF_LIST() diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2a9f08e..d4375b6 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -64,8 +64,7 @@ static const VMStateDescription vmstate_pcibus = { .name = "PCIBUS", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_INT32_EQUAL(nirq, PCIBus), VMSTATE_VARRAY_INT32(irq_count, PCIBus, nirq, 0, vmstate_info_int32, @@ -473,8 +472,7 @@ const VMStateDescription vmstate_pci_device = { .name = "PCIDevice", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32_LE(version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, vmstate_info_pci_config, @@ -490,8 +488,7 @@ const VMStateDescription vmstate_pcie_device = { .name = "PCIEDevice", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32_LE(version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, vmstate_info_pci_config, diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 991502e..090f307 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -784,8 +784,7 @@ static const VMStateDescription vmstate_pcie_aer_err = { .name = "PCIE_AER_ERROR", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT32(status, PCIEAERErr), VMSTATE_UINT16(source_id, PCIEAERErr), VMSTATE_UINT16(flags, PCIEAERErr), @@ -799,8 +798,7 @@ const VMStateDescription vmstate_pcie_aer_log = { .name = "PCIE_AER_ERROR_LOG", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT16(log_num, PCIEAERLog), VMSTATE_UINT16(log_max, PCIEAERLog), VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num, diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index cb30414..786d848 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1994,9 +1994,8 @@ static const VMStateDescription vmstate_lsi_scsi = { .name = "lsiscsi", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, .pre_save = lsi_pre_save, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, LSIState), VMSTATE_INT32(carry, LSIState), diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index e6e1ffd..c735c08 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2065,8 +2065,7 @@ static const VMStateDescription vmstate_megasas = { .name = "megasas", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, MegasasState), VMSTATE_INT32(fw_state, MegasasState), diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index ae921a6..a137c98 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1915,8 +1915,7 @@ static const VMStateDescription vmstate_scsi_sense_state = { .name = "SCSIDevice/sense", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, SCSI_SENSE_BUF_SIZE_OLD, SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD), @@ -1928,7 +1927,6 @@ const VMStateDescription vmstate_scsi_device = { .name = "SCSIDevice", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_UINT8(unit_attention.key, SCSIDevice), VMSTATE_UINT8(unit_attention.asc, SCSIDevice), diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 48a28ae..f05c772 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2571,7 +2571,6 @@ static const VMStateDescription vmstate_scsi_disk_state = { .name = "scsi-disk", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_SCSI_DEVICE(qdev, SCSIDiskState), VMSTATE_BOOL(media_changed, SCSIDiskState), diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e35bff7..f9ed926 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1143,10 +1143,9 @@ static const VMStateDescription vmstate_pvscsi = { .name = "pvscsi", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, .pre_save = pvscsi_pre_save, .post_load = pvscsi_post_load, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), VMSTATE_UINT8(msi_used, PVSCSIState), VMSTATE_UINT32(resetting, PVSCSIState), diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index e15d6bc..fa590e3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -270,8 +270,7 @@ static const VMStateDescription vmstate_hpet_rtc_irq_level = { .name = "hpet/rtc_irq_level", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(rtc_irq_level, HPETState), VMSTATE_END_OF_LIST() } @@ -281,8 +280,7 @@ static const VMStateDescription vmstate_hpet_timer = { .name = "hpet_timer", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(tn, HPETTimer), VMSTATE_UINT64(config, HPETTimer), VMSTATE_UINT64(cmp, HPETTimer), @@ -298,11 +296,10 @@ static const VMStateDescription vmstate_hpet = { .name = "hpet", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = hpet_pre_save, .pre_load = hpet_pre_load, .post_load = hpet_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(config, HPETState), VMSTATE_UINT64(isr, HPETState), VMSTATE_UINT64(hpet_counter, HPETState), diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 9db5c9d..07345f6 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -180,7 +180,6 @@ static const VMStateDescription vmstate_pit_channel = { .name = "pit channel", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .fields = (VMStateField[]) { VMSTATE_INT32(count, PITChannelState), VMSTATE_UINT16(latched_count, PITChannelState), diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 8509309..1822af2 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -720,9 +720,8 @@ static const VMStateDescription vmstate_rtc = { .name = "mc146818rtc", .version_id = 3, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = rtc_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_BUFFER(cmos_data, RTCState), VMSTATE_UINT8(cmos_index, RTCState), VMSTATE_UNUSED(7*4), diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 36d3887..b3d6f39 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -379,18 +379,18 @@ static const VMStateDescription vmstate_i6300esb = { * version_id to be set for every build. This eventually broke * migration. * - * To correct this without breaking old->new migration for older versions - * of QEMU, we've set version_id to a value high enough to exceed all past - * values of sizeof(I6300State) across various build environments, and have - * reset minimum_version_id_old/minimum_version_id to 1, since this VMSD - * has never changed and thus can accept all past versions. + * To correct this without breaking old->new migration for older + * versions of QEMU, we've set version_id to a value high enough + * to exceed all past values of sizeof(I6300State) across various + * build environments, and have reset minimum_version_id to 1, + * since this VMSD has never changed and thus can accept all past + * versions. * * For future changes we can treat these values as we normally would. */ .version_id = 10000, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, I6300State), VMSTATE_INT32(reboot_enabled, I6300State), VMSTATE_INT32(clock_scale, I6300State), diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index bc994a4..99bd7ea 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -90,8 +90,7 @@ static const VMStateDescription vmstate_ib700 = { .name = "ib700_wdt", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_TIMER(timer, IB700State), VMSTATE_END_OF_LIST() } diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c index 1d9d0e9..8bb18b4 100644 --- a/hw/xen/xen_platform.c +++ b/hw/xen/xen_platform.c @@ -375,9 +375,8 @@ static const VMStateDescription vmstate_xen_platform = { .name = "platform", .version_id = 4, .minimum_version_id = 4, - .minimum_version_id_old = 4, .post_load = xen_platform_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIXenPlatformState), VMSTATE_UINT8(flags, PCIXenPlatformState), VMSTATE_END_OF_LIST() diff --git a/target-i386/machine.c b/target-i386/machine.c index 168cab6..fe3f024 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -10,8 +10,7 @@ static const VMStateDescription vmstate_segment = { .name = "segment", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(selector, SegmentCache), VMSTATE_UINTTL(base, SegmentCache), VMSTATE_UINT32(limit, SegmentCache), @@ -36,8 +35,7 @@ static const VMStateDescription vmstate_xmm_reg = { .name = "xmm_reg", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(XMM_Q(0), XMMReg), VMSTATE_UINT64(XMM_Q(1), XMMReg), VMSTATE_END_OF_LIST() @@ -52,8 +50,7 @@ static const VMStateDescription vmstate_ymmh_reg = { .name = "ymmh_reg", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(XMM_Q(0), XMMReg), VMSTATE_UINT64(XMM_Q(1), XMMReg), VMSTATE_END_OF_LIST() @@ -67,8 +64,7 @@ static const VMStateDescription vmstate_bnd_regs = { .name = "bnd_regs", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT64(lb, BNDReg), VMSTATE_UINT64(ub, BNDReg), VMSTATE_END_OF_LIST() @@ -82,8 +78,7 @@ static const VMStateDescription vmstate_mtrr_var = { .name = "mtrr_var", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(base, MTRRVar), VMSTATE_UINT64(mask, MTRRVar), VMSTATE_END_OF_LIST() @@ -355,8 +350,7 @@ static const VMStateDescription vmstate_steal_time_msr = { .name = "cpu/steal_time_msr", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.steal_time_msr, X86CPU), VMSTATE_END_OF_LIST() } @@ -366,8 +360,7 @@ static const VMStateDescription vmstate_async_pf_msr = { .name = "cpu/async_pf_msr", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.async_pf_en_msr, X86CPU), VMSTATE_END_OF_LIST() } @@ -377,8 +370,7 @@ static const VMStateDescription vmstate_pv_eoi_msr = { .name = "cpu/async_pv_eoi_msr", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.pv_eoi_en_msr, X86CPU), VMSTATE_END_OF_LIST() } @@ -396,8 +388,7 @@ static const VMStateDescription vmstate_fpop_ip_dp = { .name = "cpu/fpop_ip_dp", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT16(env.fpop, X86CPU), VMSTATE_UINT64(env.fpip, X86CPU), VMSTATE_UINT64(env.fpdp, X86CPU), @@ -417,8 +408,7 @@ static const VMStateDescription vmstate_msr_tsc_adjust = { .name = "cpu/msr_tsc_adjust", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.tsc_adjust, X86CPU), VMSTATE_END_OF_LIST() } @@ -436,8 +426,7 @@ static const VMStateDescription vmstate_msr_tscdeadline = { .name = "cpu/msr_tscdeadline", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.tsc_deadline, X86CPU), VMSTATE_END_OF_LIST() } @@ -463,8 +452,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = { .name = "cpu/msr_ia32_misc_enable", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_ia32_misc_enable, X86CPU), VMSTATE_END_OF_LIST() } @@ -474,8 +462,7 @@ static const VMStateDescription vmstate_msr_ia32_feature_control = { .name = "cpu/msr_ia32_feature_control", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_ia32_feature_control, X86CPU), VMSTATE_END_OF_LIST() } @@ -509,8 +496,7 @@ static const VMStateDescription vmstate_msr_architectural_pmu = { .name = "cpu/msr_architectural_pmu", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_fixed_ctr_ctrl, X86CPU), VMSTATE_UINT64(env.msr_global_ctrl, X86CPU), VMSTATE_UINT64(env.msr_global_status, X86CPU), @@ -545,8 +531,7 @@ static const VMStateDescription vmstate_mpx = { .name = "cpu/mpx", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_BND_REGS(env.bnd_regs, X86CPU, 4), VMSTATE_UINT64(env.bndcs_regs.cfgu, X86CPU), VMSTATE_UINT64(env.bndcs_regs.sts, X86CPU), @@ -567,8 +552,7 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { .name = "cpu/msr_hyperv_hypercall", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), VMSTATE_END_OF_LIST() @@ -587,8 +571,7 @@ static const VMStateDescription vmstate_msr_hyperv_vapic = { .name = "cpu/msr_hyperv_vapic", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_hv_vapic, X86CPU), VMSTATE_END_OF_LIST() } @@ -606,8 +589,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = { .name = "cpu/msr_hyperv_time", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(env.msr_hv_tsc, X86CPU), VMSTATE_END_OF_LIST() } @@ -617,10 +599,9 @@ const VMStateDescription vmstate_x86_cpu = { .name = "cpu", .version_id = 12, .minimum_version_id = 3, - .minimum_version_id_old = 3, .pre_save = cpu_pre_save, .post_load = cpu_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.regs, X86CPU, CPU_NB_REGS), VMSTATE_UINTTL(env.eip, X86CPU), VMSTATE_UINTTL(env.eflags, X86CPU),
After previous Peter patch, they are redundant. This way we don't asign them except when needed. Once there, there were lots of case where the ".fields" indentation was wrong: .fields = (VMStateField []) { and .fields = (VMStateField []) { Change all the combinations to: .fields = (VMStateField[]){ The biggest problem (appart of aesthetics) was that checkpatch complained when we copy&pasted the code from one place to another. Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/acpi/ich9.c | 1 - hw/acpi/pcihp.c | 3 +- hw/acpi/piix4.c | 8 ++---- hw/audio/ac97.c | 6 ++-- hw/audio/cs4231.c | 3 +- hw/audio/cs4231a.c | 3 +- hw/audio/es1370.c | 6 ++-- hw/audio/gus.c | 3 +- hw/audio/hda-codec.c | 4 +-- hw/audio/intel-hda.c | 4 +-- hw/audio/sb16.c | 3 +- hw/block/fdc.c | 16 ++++------- hw/char/serial-pci.c | 4 +-- hw/char/serial.c | 2 +- hw/display/cirrus_vga.c | 6 ++-- hw/display/vga-pci.c | 3 +- hw/display/vga.c | 3 +- hw/display/vmware_vga.c | 6 ++-- hw/dma/i8257.c | 6 ++-- hw/i386/acpi-build.c | 3 +- hw/i386/kvm/clock.c | 1 - hw/i386/kvmvapic.c | 3 -- hw/i386/pc.c | 3 +- hw/ide/ahci.c | 6 ++-- hw/ide/ich.c | 2 +- hw/ide/isa.c | 3 +- hw/ide/pci.c | 12 +++----- hw/input/pckbd.c | 6 ++-- hw/input/ps2.c | 12 +++----- hw/input/vmmouse.c | 3 +- hw/intc/i8259_common.c | 1 - hw/intc/ioapic_common.c | 1 - hw/isa/apm.c | 1 - hw/isa/lpc_ich9.c | 1 - hw/isa/piix4.c | 3 +- hw/isa/vt82c686.c | 6 ++-- hw/net/e1000.c | 6 ++-- hw/net/eepro100.c | 3 +- hw/net/ne2000-isa.c | 3 +- hw/net/ne2000.c | 6 ++-- hw/net/pcnet-pci.c | 3 +- hw/net/pcnet.c | 3 +- hw/net/rtl8139.c | 9 ++---- hw/net/vmxnet3.c | 4 +-- hw/nvram/eeprom93xx.c | 3 +- hw/nvram/fw_cfg.c | 3 +- hw/pci-bridge/ioh3420.c | 1 - hw/pci-bridge/xio3130_downstream.c | 1 - hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/piix.c | 7 ++--- hw/pci-host/q35.c | 3 +- hw/pci/pci.c | 9 ++---- hw/pci/pcie_aer.c | 6 ++-- hw/scsi/lsi53c895a.c | 3 +- hw/scsi/megasas.c | 3 +- hw/scsi/scsi-bus.c | 4 +-- hw/scsi/scsi-disk.c | 1 - hw/scsi/vmw_pvscsi.c | 3 +- hw/timer/hpet.c | 9 ++---- hw/timer/i8254_common.c | 1 - hw/timer/mc146818rtc.c | 3 +- hw/watchdog/wdt_i6300esb.c | 14 +++++----- hw/watchdog/wdt_ib700.c | 3 +- hw/xen/xen_platform.c | 3 +- target-i386/machine.c | 57 +++++++++++++------------------------- 65 files changed, 113 insertions(+), 219 deletions(-)