[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject |
Date: |
Wed, 7 Oct 2009 13:42:00 -0300 |
Appropriate error handling support will be needed to have
encrypted images working under the future machine protocol,
but this initial conversion will work with the current
user protocol.
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 ab15289..d393ad5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -614,7 +614,10 @@ struct bdrv_iterate_context {
int err;
};
-static void do_cont(Monitor *mon, const QDict *qdict)
+/**
+ * do_cont(): Resume emulation.
+ */
+static void do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
struct bdrv_iterate_context context = { mon, 0 };
@@ -630,7 +633,7 @@ static void bdrv_key_cb(void *opaque, int err)
/* another key was set successfully, retry to continue */
if (!err)
- do_cont(mon, NULL);
+ do_cont(mon, NULL, NULL);
}
static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 3efc716..8dca4f1 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -301,7 +301,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "resume emulation",
- .mhandler.cmd = do_cont,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_cont,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
- [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style, (continued)
- [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 05/18] monitor: union for info handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 06/18] monitor: union for command handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 17/18] monitor: Convert do_info_balloon() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 18/18] monitor: Convert do_info_cpus() to QObject, Luiz Capitulino, 2009/10/07