[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 04/48] savevm: Fix -loadvm to report errors to s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 04/48] savevm: Fix -loadvm to report errors to stderr, not the monitor |
Date: |
Wed, 24 Feb 2010 18:55:16 +0100 |
A monitor may not even exist.
Change load_vmstate() to use qemu_error() instead of monitor_printf().
Parameter mon is now unused, remove it.
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 2 +-
savevm.c | 24 +++++++++++-------------
sysemu.h | 2 +-
vl.c | 2 +-
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/monitor.c b/monitor.c
index 9ed3ec4..9a21dfb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2532,7 +2532,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();
}
diff --git a/savevm.c b/savevm.c
index 4b58663..1f6c25e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1733,7 +1733,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;
@@ -1743,7 +1743,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;
}
@@ -1756,21 +1756,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 */
@@ -1788,13 +1786,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;
diff --git a/sysemu.h b/sysemu.h
index 8ba618e..4d8b7a2 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -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);
diff --git a/vl.c b/vl.c
index db7a178..8a588c7 100644
--- a/vl.c
+++ b/vl.c
@@ -6023,7 +6023,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;
}
}
--
1.6.6
- [Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out of qdev_create(), (continued)
- [Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out of qdev_create(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 36/48] error: New error_printf_unless_qmp(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 19/48] error: Track locations in configuration files, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 47/48] monitor: Use argument type 'O' for device_add, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 31/48] error: New QERR_BUS_NOT_FOUND, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 27/48] error: New QERR_PROPERTY_NOT_FOUND, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 29/48] qdev: convert setting device properties to QError, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 03/48] usb: Remove disabled monitor_printf() in usb_read_file(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 10/48] error: Simplify error sink setup, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 39/48] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 04/48] savevm: Fix -loadvm to report errors to stderr, not the monitor,
Markus Armbruster <=
- [Qemu-devel] Re: [PATCH RFC 00/48] Convert device_add to QObject / QError, Michael S. Tsirkin, 2010/02/25
- Re: [Qemu-devel] [PATCH RFC 00/48] Convert device_add to QObject / QError, Luiz Capitulino, 2010/02/26