aboutsummaryrefslogtreecommitdiff
path: root/hw/watchdog
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2014-04-16 15:32:32 +0200
committerJuan Quintela <quintela@redhat.com>2014-06-16 04:55:26 +0200
commitd49805aeea558474b18663268b243cee4a520fe8 (patch)
treea436d5626a9b20e16ec764988997e45007295d0b /hw/watchdog
parent3aff6c2fea770a5e8a00ff43d7665f4d28e935cd (diff)
downloadqemu-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/watchdog')
-rw-r--r--hw/watchdog/wdt_i6300esb.c14
-rw-r--r--hw/watchdog/wdt_ib700.c3
2 files changed, 8 insertions, 9 deletions
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 68b33e1..8cb9827 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -92,8 +92,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()
}