Commit 6f4923fc authored by Peter Maydell's avatar Peter Maydell Committed by Juan Quintela
Browse files

migration: Correctly handle subsections with no 'needed' function 



Currently the vmstate subsection handling code treats a subsection
with no 'needed' function pointer as if it were the subsection
list terminator, so the subsection is never transferred and nor
is any subsection following it in the list.

Handle NULL 'needed' function pointers in subsections in the same
way that we do for top level VMStateDescription structures:
treat the subsection as always being needed.

This doesn't change behaviour for the current set of devices
in the tree, because all subsections declare a 'needed' function.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent be1d2c49

migration/vmstate.c

+3 −3
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, 
static const VMStateDescription *

vmstate_get_subsection(const VMStateDescription **sub, char *idstr)

{

    while (sub && *sub && (*sub)->needed) {

    while (sub && *sub) {

        if (strcmp(idstr, (*sub)->name) == 0) {

            return *sub;

        }
@@ -486,8 +486,8 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, 
    int ret = 0;



    trace_vmstate_subsection_save_top(vmsd->name);

    while (sub && *sub && (*sub)->needed) {

        if ((*sub)->needed(opaque)) {

    while (sub && *sub) {

        if (vmstate_save_needed(*sub, opaque)) {

            const VMStateDescription *vmsdsub = *sub;

            uint8_t len;