Commit ea7415fa authored by Liang Li's avatar Liang Li Committed by Juan Quintela
Browse files

migration: rename qemu_savevm_state_cancel 



The function qemu_savevm_state_cancel is called after the migration
in migration_thread, it seems strange to 'cancel' it after completion,
rename it to qemu_savevm_state_cleanup looks better.

Signed-off-by: default avatarLiang Li <liang.z.li@intel.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com&gt;al3>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
parent 94f5a437

include/sysemu/sysemu.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void qemu_savevm_state_begin(QEMUFile *f, 
void qemu_savevm_state_header(QEMUFile *f);

int qemu_savevm_state_iterate(QEMUFile *f);

void qemu_savevm_state_complete(QEMUFile *f);

void qemu_savevm_state_cancel(void);

void qemu_savevm_state_cleanup(void);

uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);

int qemu_loadvm_state(QEMUFile *f);

migration/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ static void *migration_thread(void *opaque) 
    end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);



    qemu_mutex_lock_iothread();

    qemu_savevm_state_cancel();

    qemu_savevm_state_cleanup();

    if (s->state == MIGRATION_STATUS_COMPLETED) {

        uint64_t transferred_bytes = qemu_ftell(s->file);

        s->total_time = end_time - s->total_time;

migration/savevm.c

+3 −3
Original line number Diff line number Diff line
@@ -902,11 +902,11 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) 
    return ret;

}



void qemu_savevm_state_cancel(void)

void qemu_savevm_state_cleanup(void)

{

    SaveStateEntry *se;



    trace_savevm_state_cancel();

    trace_savevm_state_cleanup();

    QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {

        if (se->ops && se->ops->cancel) {

            se->ops->cancel(se->opaque);
@@ -943,7 +943,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) 
        ret = qemu_file_get_error(f);

    }

    if (ret != 0) {

        qemu_savevm_state_cancel();

        qemu_savevm_state_cleanup();

        error_setg_errno(errp, -ret, "Error while writing VM state");

    }

    return ret;

trace-events

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ savevm_state_begin(void) "" 
savevm_state_header(void) ""

savevm_state_iterate(void) ""

savevm_state_complete(void) ""

savevm_state_cancel(void) ""

savevm_state_cleanup(void) ""

vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s"

vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s"

qemu_announce_self_iter(const char *mac) "%s"