From 829dbad99d80464a2e89ec0ee98460c30a0d57fc Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Sun, 9 Oct 2011 19:32:10 +0200 Subject: [PATCH 6/8] Revert "savevm: fix corruption in vmstate_subsection_load()." RH-Author: Juan Quintela Message-id: <2822441653f707c58a3e4ea434fccbd4d8392dba.1318188414.git.quintela@redhat.com> Patchwork-id: 33954 O-Subject: [PATCH 5/5] Revert "savevm: fix corruption in vmstate_subsection_load()." Bugzilla: 725565 RH-Acked-by: Orit Wasserman RH-Acked-by: Paolo Bonzini RH-Acked-by: Alex Williamson This reverts commit eb60260de0b050a5e8ab725e84d377d0b44c43ae. Conflicts: savevm.c We changed qemu_peek_byte() prototype, just fixed the rejects. Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori Signed-off-by: Juan Quintela --- savevm.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) Signed-off-by: Michal Novotny --- savevm.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/savevm.c b/savevm.c index 8a17484..7219196 100644 --- a/savevm.c +++ b/savevm.c @@ -1693,12 +1693,6 @@ static const VMStateDescription *vmstate_get_subsection(const VMStateSubsection static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, void *opaque) { - const VMStateSubsection *sub = vmsd->subsections; - - if (!sub || !sub->needed) { - return 0; - } - while (qemu_peek_byte(f, 0) == QEMU_VM_SUBSECTION) { char idstr[256]; int ret; @@ -1720,7 +1714,7 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, /* it don't have a valid subsection name */ return 0; } - sub_vmsd = vmstate_get_subsection(sub, idstr); + sub_vmsd = vmstate_get_subsection(vmsd->subsections, idstr); if (sub_vmsd == NULL) { return -ENOENT; } @@ -1729,7 +1723,6 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, qemu_file_skip(f, len); /* idstr */ version_id = qemu_get_be32(f); - assert(!sub_vmsd->subsections); ret = vmstate_load_state(f, sub_vmsd, opaque, version_id); if (ret) { return ret; @@ -1753,7 +1746,6 @@ static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, qemu_put_byte(f, len); qemu_put_buffer(f, (uint8_t *)vmsd->name, len); qemu_put_be32(f, vmsd->version_id); - assert(!vmsd->subsections); vmstate_save_state(f, vmsd, opaque); } sub++; -- 1.7.4.4