diff options
author | Juan Quintela <quintela@redhat.com> | 2014-04-16 15:32:32 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2014-06-16 04:55:26 +0200 |
commit | d49805aeea558474b18663268b243cee4a520fe8 (patch) | |
tree | a436d5626a9b20e16ec764988997e45007295d0b /hw/acpi | |
parent | 3aff6c2fea770a5e8a00ff43d7665f4d28e935cd (diff) | |
download | qemu-d49805aeea558474b18663268b243cee4a520fe8.zip qemu-d49805aeea558474b18663268b243cee4a520fe8.tar.gz qemu-d49805aeea558474b18663268b243cee4a520fe8.tar.bz2 |
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: Juan Quintela <quintela@redhat.com>
Acked-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/acpi')
-rw-r--r-- | hw/acpi/ich9.c | 1 | ||||
-rw-r--r-- | hw/acpi/pcihp.c | 3 | ||||
-rw-r--r-- | hw/acpi/piix4.c | 8 |
3 files changed, 4 insertions, 8 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 3b143b3..fae663a 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -324,8 +324,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), |