From: Juan Quintela <quintela@redhat.com>
Date: Fri, 28 Aug 2009 13:28:25 +0000 (+0200)
Subject: VMState: Fix sub-structs versioning
X-Git-Tag: v0.12.0-rc0~1338
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fa3aad24d94a6cf894db52d83f72a399324a17bb;p=qemu-xen-4.2-testing.git

VMState: Fix sub-structs versioning

We can't check the version in a substruct, it is not stored anywhere

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/savevm.c b/savevm.c
index 2b4054a12..99fad798a 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1048,7 +1048,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
                 void *addr = base_addr + field->size * i;
 
                 if (field->flags & VMS_STRUCT) {
-                    ret = vmstate_load_state(f, field->vmsd, addr, version_id);
+                    ret = vmstate_load_state(f, field->vmsd, addr, field->vmsd->version_id);
                 } else {
                     ret = field->info->get(f, addr, field->size);