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

migration: eliminate last_round 

We will go around the loop exactly once after setting last_round.
Eliminate the variable altogether.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:32 +01:00 committed by Juan Quintela
parent 05f28b837c
commit 059f896cef
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration.c
View File

@ -626,7 +626,6 @@ static void *migration_thread(void *opaque)
int64_t max_size = 0; int64_t max_size = 0;
int64_t start_time = initial_time; int64_t start_time = initial_time;
bool old_vm_running = false; bool old_vm_running = false;
bool last_round = false;
DPRINTF("beginning savevm\n"); DPRINTF("beginning savevm\n");
qemu_savevm_state_begin(s->file, &s->params); qemu_savevm_state_begin(s->file, &s->params);
@ -650,8 +649,11 @@ static void *migration_thread(void *opaque)
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
s->xfer_limit = INT_MAX; s->xfer_limit = INT_MAX;
qemu_savevm_state_complete(s->file); qemu_savevm_state_complete(s->file);
last_round = true;
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
if (!qemu_file_get_error(s->file)) {
migrate_finish_set_state(s, MIG_STATE_COMPLETED);
break;
}
} }
} }
@ -675,15 +677,13 @@ static void *migration_thread(void *opaque)
sleep_time = 0; sleep_time = 0;
initial_time = current_time; initial_time = current_time;
} }
if (!last_round && (s->bytes_xfer >= s->xfer_limit)) { if (s->bytes_xfer >= s->xfer_limit) {
/* usleep expects microseconds */ /* usleep expects microseconds */
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
sleep_time += qemu_get_clock_ms(rt_clock) - current_time; sleep_time += qemu_get_clock_ms(rt_clock) - current_time;
} }
if (qemu_file_get_error(s->file)) { if (qemu_file_get_error(s->file)) {
migrate_finish_set_state(s, MIG_STATE_ERROR); migrate_finish_set_state(s, MIG_STATE_ERROR);
} else if (last_round) {
migrate_finish_set_state(s, MIG_STATE_COMPLETED);
} }
} }
@ -695,7 +695,6 @@ static void *migration_thread(void *opaque)
runstate_set(RUN_STATE_POSTMIGRATE); runstate_set(RUN_STATE_POSTMIGRATE);
} else { } else {
if (old_vm_running) { if (old_vm_running) {
assert(last_round);
vm_start(); vm_start();
} }
} }