aboutsummaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-10-07 13:42:00 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:19 -0500
commita1f896a04161ed429532da3ff220776ca0b1fbc9 (patch)
tree63336b683922cb60bdd86fdd8578d32e9143322f /monitor.c
parent4307666463cb94f22f59bb47f701ff2d4911aae0 (diff)
downloadqemu-a1f896a04161ed429532da3ff220776ca0b1fbc9.zip
qemu-a1f896a04161ed429532da3ff220776ca0b1fbc9.tar.gz
qemu-a1f896a04161ed429532da3ff220776ca0b1fbc9.tar.bz2
monitor: Convert do_cont() to QObject
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. Patchworks-ID: 35348 Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index ab15289..d393ad52 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)