OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

savevm: Fix -loadvm to report errors to stderr, not the monitor 

A monitor may not even exist.

Change load_vmstate() to use qemu_error() instead of monitor_printf().
Parameter mon is now unused, remove it.
This commit is contained in:
Markus Armbruster 2010-02-17 16:24:10 +01:00
parent 4491e0f398
commit 03cd4655cb
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.c
View File

@ -2533,7 +2533,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict)
vm_stop(0);
if (load_vmstate(mon, name) >= 0 && saved_vm_running)
if (load_vmstate(name) >= 0 && saved_vm_running)
vm_start();
}

24
savevm.c
View File

@ -1737,7 +1737,7 @@ void do_savevm(Monitor *mon, const QDict *qdict)
vm_start();
}
int load_vmstate(Monitor *mon, const char *name)
int load_vmstate(const char *name)
{
DriveInfo *dinfo;
BlockDriverState *bs, *bs1;
@ -1747,7 +1747,7 @@ int load_vmstate(Monitor *mon, const char *name)
bs = get_bs_snapshots();
if (!bs) {
monitor_printf(mon, "No block device supports snapshots\n");
qemu_error("No block device supports snapshots\n");
return -EINVAL;
}
@ -1760,21 +1760,19 @@ int load_vmstate(Monitor *mon, const char *name)
ret = bdrv_snapshot_goto(bs1, name);
if (ret < 0) {
if (bs != bs1)
monitor_printf(mon, "Warning: ");
qemu_error("Warning: ");
switch(ret) {
case -ENOTSUP:
monitor_printf(mon,
"Snapshots not supported on device '%s'\n",
bdrv_get_device_name(bs1));
qemu_error("Snapshots not supported on device '%s'\n",
bdrv_get_device_name(bs1));
break;
case -ENOENT:
monitor_printf(mon, "Could not find snapshot '%s' on "
"device '%s'\n",
name, bdrv_get_device_name(bs1));
qemu_error("Could not find snapshot '%s' on device '%s'\n",
name, bdrv_get_device_name(bs1));
break;
default:
monitor_printf(mon, "Error %d while activating snapshot on"
" '%s'\n", ret, bdrv_get_device_name(bs1));
qemu_error("Error %d while activating snapshot on '%s'\n",
ret, bdrv_get_device_name(bs1));
break;
}
/* fatal on snapshot block device */
@ -1792,13 +1790,13 @@ int load_vmstate(Monitor *mon, const char *name)
/* restore the VM state */
f = qemu_fopen_bdrv(bs, 0);
if (!f) {
monitor_printf(mon, "Could not open VM state file\n");
qemu_error("Could not open VM state file\n");
return -EINVAL;
}
ret = qemu_loadvm_state(f);
qemu_fclose(f);
if (ret < 0) {
monitor_printf(mon, "Error %d while loading VM state\n", ret);
qemu_error("Error %d while loading VM state\n", ret);
return ret;
}
return 0;

2
sysemu.h
View File

@ -54,7 +54,7 @@ extern qemu_irq qemu_system_powerdown;
void qemu_system_reset(void);
void do_savevm(Monitor *mon, const QDict *qdict);
int load_vmstate(Monitor *mon, const char *name);
int load_vmstate(const char *name);
void do_delvm(Monitor *mon, const QDict *qdict);
void do_info_snapshots(Monitor *mon);

2
vl.c
View File

@ -6072,7 +6072,7 @@ int main(int argc, char **argv, char **envp)
qemu_system_reset();
if (loadvm) {
if (load_vmstate(cur_mon, loadvm) < 0) {
if (load_vmstate(loadvm) < 0) {
autostart = 0;
}
}