[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/22] savevm: Convert do_loadvm() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 22/22] savevm: Convert do_loadvm() to QObject |
Date: |
Tue, 20 Apr 2010 18:09:52 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 7 +++++--
qemu-monitor.hx | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 542c858..32f0396 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2465,18 +2465,21 @@ static int do_closefd(Monitor *mon, const QDict *qdict,
QObject **ret_data)
return -1;
}
-static void do_loadvm(Monitor *mon, const QDict *qdict)
+static int do_loadvm(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
+ int ret;
int saved_vm_running = vm_running;
const char *name = qdict_get_str(qdict, "name");
vm_stop(0);
- load_vmstate(name);
+ ret = load_vmstate(name);
if (saved_vm_running) {
vm_start();
}
+
+ return (ret < 0 ? -1 : 0);
}
int monitor_get_fd(Monitor *mon, const char *fdname)
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 9a699d4..d1d02b0 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -260,7 +260,8 @@ ETEXI
.args_type = "name:s",
.params = "tag|id",
.help = "restore a VM snapshot from its tag or id",
- .mhandler.cmd = do_loadvm,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_loadvm,
},
STEXI
--
1.7.1.rc1.12.ga6018
- [Qemu-devel] [PATCH 13/22] QError: New QERR_STATEVM_LOAD_FAILED, (continued)
- [Qemu-devel] [PATCH 19/22] savevm: Convert do_savevm() to QError, Luiz Capitulino, 2010/04/20
- [Qemu-devel] [PATCH 16/22] savevm: Convert delete_snapshot() to QError, Luiz Capitulino, 2010/04/20
- [Qemu-devel] [PATCH 20/22] savevm: Convert do_savevm() to QObject, Luiz Capitulino, 2010/04/20
- [Qemu-devel] [PATCH 21/22] savevm: Convert do_loadvm() to QError, Luiz Capitulino, 2010/04/20
- [Qemu-devel] [PATCH 22/22] savevm: Convert do_loadvm() to QObject,
Luiz Capitulino <=
- [Qemu-devel] Re: [RFC 00/22]: QMP: Convert savevm/loadvm/delvm, Juan Quintela, 2010/04/20