summaryrefslogtreecommitdiffstats
path: root/hw/isa
diff options
context:
space:
mode:
authorJuan Quintela2014-04-16 15:32:32 +0200
committerJuan Quintela2014-06-16 04:55:26 +0200
commitd49805aeea558474b18663268b243cee4a520fe8 (patch)
treea436d5626a9b20e16ec764988997e45007295d0b /hw/isa
parentsavevm: Remove all the unneeded version_minimum_id_old (ppc) (diff)
downloadqemu-d49805aeea558474b18663268b243cee4a520fe8.tar.gz
qemu-d49805aeea558474b18663268b243cee4a520fe8.tar.xz
qemu-d49805aeea558474b18663268b243cee4a520fe8.zip
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/isa')
-rw-r--r--hw/isa/apm.c1
-rw-r--r--hw/isa/lpc_ich9.c1
-rw-r--r--hw/isa/piix4.c3
-rw-r--r--hw/isa/vt82c686.c6
4 files changed, 3 insertions, 8 deletions
diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index f97e7a0c24..054d529b8b 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 51ce12dad6..97f69d6001 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 492cd22fcf..1aa17d7cf6 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 1a93afda4f..e0c235c3c2 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()
}