Commit d49805ae authored by Juan Quintela's avatar Juan Quintela
Browse files

savevm: Remove all the unneeded version_minimum_id_old (x86) 



After previous Peter patch, they are redundant.  This way we don't
assign 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 from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Acked-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3aff6c2f

hw/acpi/ich9.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

hw/acpi/pcihp.c

+1 −2
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ 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[]) {

        VMSTATE_UINT32(up, AcpiPciHpPciStatus),

        VMSTATE_UINT32(down, AcpiPciHpPciStatus),

hw/acpi/piix4.c

+3 −5
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static const VMStateDescription vmstate_gpe = { 
    .name = "gpe",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_GPE_ARRAY(sts, ACPIGPE),

        VMSTATE_GPE_ARRAY(en, ACPIGPE),
@@ -189,7 +188,6 @@ static const VMStateDescription vmstate_pci_status = { 
    .name = "pci_status",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(up, struct AcpiPciHpPciStatus),

        VMSTATE_UINT32(down, struct AcpiPciHpPciStatus),

hw/audio/ac97.c

+2 −4
Original line number Diff line number Diff line
@@ -1163,7 +1163,6 @@ 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[]) {

        VMSTATE_UINT32 (bdbar, AC97BusMasterRegs),

        VMSTATE_UINT8 (civ, AC97BusMasterRegs),
@@ -1211,7 +1210,6 @@ 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[]) {

        VMSTATE_PCI_DEVICE (dev, AC97LinkState),

hw/audio/cs4231.c

+1 −2
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static const VMStateDescription vmstate_cs4231 = { 
    .name ="cs4231",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS),

        VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS),