| Message ID | 52f527437b109e2cb82e80c37fec4e3b2d7c2cae.1317738629.git.quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/04/2011 09:38 AM, Juan Quintela wrote: > This reverts commit eb60260de0b050a5e8ab725e84d377d0b44c43ae. > > Conflicts: > > savevm.c > > We changed qemu_peek_byte() prototype, just fixed the rejects. > > Signed-off-by: Juan Quintela<quintela@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Regards, Anthony Liguori > --- > savevm.c | 10 +--------- > 1 files changed, 1 insertions(+), 9 deletions(-) > > diff --git a/savevm.c b/savevm.c > index db6ea12..aaa303e 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -1715,12 +1715,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; > @@ -1742,7 +1736,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; > } > @@ -1752,7 +1746,6 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, > idstr[len] = 0; > version_id = qemu_get_be32(f); > > - assert(!sub_vmsd->subsections); > ret = vmstate_load_state(f, sub_vmsd, opaque, version_id); > if (ret) { > return ret; > @@ -1776,7 +1769,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++;
diff --git a/savevm.c b/savevm.c index db6ea12..aaa303e 100644 --- a/savevm.c +++ b/savevm.c @@ -1715,12 +1715,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; @@ -1742,7 +1736,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; } @@ -1752,7 +1746,6 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, idstr[len] = 0; version_id = qemu_get_be32(f); - assert(!sub_vmsd->subsections); ret = vmstate_load_state(f, sub_vmsd, opaque, version_id); if (ret) { return ret; @@ -1776,7 +1769,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++;
This reverts commit eb60260de0b050a5e8ab725e84d377d0b44c43ae. Conflicts: savevm.c We changed qemu_peek_byte() prototype, just fixed the rejects. Signed-off-by: Juan Quintela <quintela@redhat.com> --- savevm.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)