Commit df896152 authored by Juan Quintela's avatar Juan Quintela
Browse files

vmstate: Create optional sections 



To make sections optional, we need to do it at the beggining of the code.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 13d16814

include/migration/vmstate.h

+2 −0
Original line number Diff line number Diff line
@@ -820,6 +820,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, 
void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,

                        void *opaque, QJSON *vmdesc);



bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque);



int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,

                                   const VMStateDescription *vmsd,

                                   void *base, int alias_id,

migration/savevm.c

+8 −0
Original line number Diff line number Diff line
@@ -836,6 +836,11 @@ void qemu_savevm_state_complete(QEMUFile *f) 
        if ((!se->ops || !se->ops->save_state) && !se->vmsd) {

            continue;

        }

        if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) {

            trace_savevm_section_skip(se->idstr, se->section_id);

            continue;

        }



        trace_savevm_section_start(se->idstr, se->section_id);



        json_start_object(vmdesc, NULL);
@@ -949,6 +954,9 @@ static int qemu_save_device_state(QEMUFile *f) 
        if ((!se->ops || !se->ops->save_state) && !se->vmsd) {

            continue;

        }

        if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) {

            continue;

        }



        save_section_header(f, se, QEMU_VM_SECTION_FULL);

migration/vmstate.c

+11 −0
Original line number Diff line number Diff line
@@ -276,6 +276,17 @@ static void vmsd_desc_field_end(const VMStateDescription *vmsd, QJSON *vmdesc, 
    json_end_object(vmdesc);

}





bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque)

{

    if (vmsd->needed && !vmsd->needed(opaque)) {

        /* optional section not needed */

        return false;

    }

    return true;

}





void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,

                        void *opaque, QJSON *vmdesc)

{

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u" 
qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u"

savevm_section_start(const char *id, unsigned int section_id) "%s, section_id %u"

savevm_section_end(const char *id, unsigned int section_id, int ret) "%s, section_id %u -> %d"

savevm_section_skip(const char *id, unsigned int section_id) "%s, section_id %u"

savevm_state_begin(void) ""

savevm_state_header(void) ""

savevm_state_iterate(void) ""