david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: return real error code

Browse Source 
make functions propagate errno, instead of just using -EIO.  Add a
comment about what are the return value of qemu_savevm_state_iterate().

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2011-09-22 11:02:14 +02:00
parent dcd1d224df
commit 3934638539
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration.c
View File

@ -367,6 +367,7 @@ void migrate_fd_connect(FdMigrationState *s)
void migrate_fd_put_ready(void *opaque) void migrate_fd_put_ready(void *opaque)
{ {
FdMigrationState *s = opaque; FdMigrationState *s = opaque;
int ret;
if (s->state != MIG_STATE_ACTIVE) { if (s->state != MIG_STATE_ACTIVE) {
DPRINTF("put_ready returning because of non-active state\n"); DPRINTF("put_ready returning because of non-active state\n");
@ -374,7 +375,10 @@ void migrate_fd_put_ready(void *opaque)
} }
DPRINTF("iterate\n"); DPRINTF("iterate\n");
if (qemu_savevm_state_iterate(s->mon, s->file) == 1) { ret = qemu_savevm_state_iterate(s->mon, s->file);
if (ret < 0) {
migrate_fd_error(s);
} else if (ret == 1) {
int old_vm_running = runstate_is_running(); int old_vm_running = runstate_is_running();
DPRINTF("done iterating\n"); DPRINTF("done iterating\n");

41
savevm.c
View File

@ -1504,6 +1504,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
int shared) int shared)
{ {
SaveStateEntry *se; SaveStateEntry *se;
int ret;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_handlers, entry) {
if(se->set_params == NULL) { if(se->set_params == NULL) {
@ -1535,15 +1536,21 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
se->save_live_state(mon, f, QEMU_VM_SECTION_START, se->opaque); se->save_live_state(mon, f, QEMU_VM_SECTION_START, se->opaque);
} }
ret = qemu_file_has_error(f);
if (qemu_file_has_error(f)) { if (ret != 0) {
qemu_savevm_state_cancel(mon, f); qemu_savevm_state_cancel(mon, f);
return -EIO;
} }
return 0; return ret;
} }
/*
* this funtion has three return values:
* negative: there was one error, and we have -errno.
* 0 : We haven't finished, caller have to go again
* 1 : We have finished, we can go to complete phase
*/
int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
{ {
SaveStateEntry *se; SaveStateEntry *se;
@ -1566,16 +1573,14 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
break; break;
} }
} }
if (ret != 0) {
if (ret) return ret;
return 1;
if (qemu_file_has_error(f)) {
qemu_savevm_state_cancel(mon, f);
return -EIO;
} }
ret = qemu_file_has_error(f);
return 0; if (ret != 0) {
qemu_savevm_state_cancel(mon, f);
}
return ret;
} }
int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
@ -1618,10 +1623,7 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
qemu_put_byte(f, QEMU_VM_EOF); qemu_put_byte(f, QEMU_VM_EOF);
if (qemu_file_has_error(f)) return qemu_file_has_error(f);
return -EIO;
return 0;
} }
void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f)
@ -1661,8 +1663,9 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f)
ret = qemu_savevm_state_complete(mon, f); ret = qemu_savevm_state_complete(mon, f);
out: out:
if (qemu_file_has_error(f)) if (ret == 0) {
ret = -EIO; ret = qemu_file_has_error(f);
}
if (!ret && saved_vm_running) if (!ret && saved_vm_running)
vm_start(); vm_start();