Commit 3a011c26 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Remove section_id parameter from vmstate_load 



Everything else assumes that we always load a device from its own
savevm handler.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent c2355ad4

migration/savevm.c

+5 −5
Original line number Diff line number Diff line
@@ -746,13 +746,13 @@ void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, 
    }

}



static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id)

static int vmstate_load(QEMUFile *f, SaveStateEntry *se)

{

    trace_vmstate_load(se->idstr, se->vmsd ? se->vmsd->name : "(old)");

    if (!se->vmsd) {         /* Old style */

        return se->ops->load_state(f, se->opaque, version_id);

        return se->ops->load_state(f, se->opaque, se->load_version_id);

    }

    return vmstate_load_state(f, se->vmsd, se->opaque, version_id);

    return vmstate_load_state(f, se->vmsd, se->opaque, se->load_version_id);

}



static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc)
@@ -1882,7 +1882,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis) 
        return -EINVAL;

    }



    ret = vmstate_load(f, se, se->load_version_id);

    ret = vmstate_load(f, se);

    if (ret < 0) {

        error_report("error while loading state for instance 0x%x of"

                     " device '%s'", instance_id, idstr);
@@ -1915,7 +1915,7 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis) 
        return -EINVAL;

    }



    ret = vmstate_load(f, se, se->load_version_id);

    ret = vmstate_load(f, se);

    if (ret < 0) {

        error_report("error while loading state section id %d(%s)",

                     section_id, se->idstr);