ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Liang Li <liang.z.li@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>al3
Reviewed-by: Amit Shah <amit.shah@redhat.com>al3
Signed-off-by: Juan Quintela <quintela@redhat.com>al3
This commit is contained in:
Liang Li 2015-11-02 15:37:01 +08:00 committed by Juan Quintela
parent 94f5a43704
commit ea7415fac6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/sysemu.h
View File

@ -89,7 +89,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
void qemu_savevm_state_header(QEMUFile *f); void qemu_savevm_state_header(QEMUFile *f);
int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f);
void qemu_savevm_state_complete(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); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
int qemu_loadvm_state(QEMUFile *f); int qemu_loadvm_state(QEMUFile *f);

2
migration/migration.c
View File

@ -1090,7 +1090,7 @@ static void *migration_thread(void *opaque)
end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
qemu_savevm_state_cancel(); qemu_savevm_state_cleanup();
if (s->state == MIGRATION_STATUS_COMPLETED) { if (s->state == MIGRATION_STATUS_COMPLETED) {
uint64_t transferred_bytes = qemu_ftell(s->file); uint64_t transferred_bytes = qemu_ftell(s->file);
s->total_time = end_time - s->total_time; s->total_time = end_time - s->total_time;

6
migration/savevm.c
View File

@ -902,11 +902,11 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
return ret; return ret;
} }
void qemu_savevm_state_cancel(void) void qemu_savevm_state_cleanup(void)
{ {
SaveStateEntry *se; SaveStateEntry *se;
trace_savevm_state_cancel(); trace_savevm_state_cleanup();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (se->ops && se->ops->cancel) { if (se->ops && se->ops->cancel) {
se->ops->cancel(se->opaque); se->ops->cancel(se->opaque);
@ -943,7 +943,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
} }
if (ret != 0) { if (ret != 0) {
qemu_savevm_state_cancel(); qemu_savevm_state_cleanup();
error_setg_errno(errp, -ret, "Error while writing VM state"); error_setg_errno(errp, -ret, "Error while writing VM state");
} }
return ret; return ret;

2
trace-events
View File

@ -1211,7 +1211,7 @@ savevm_state_begin(void) ""
savevm_state_header(void) "" savevm_state_header(void) ""
savevm_state_iterate(void) "" savevm_state_iterate(void) ""
savevm_state_complete(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_save(const char *idstr, const char *vmsd_name) "%s, %s"
vmstate_load(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" qemu_announce_self_iter(const char *mac) "%s"