From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvZbN-0002UT-Vm for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvZbH-0002R8-SX for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:56 -0400 Received: from [199.232.76.173] (port=49989 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvZbH-0002R1-LK for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27224) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvZbG-0005Vb-Jc for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:51 -0400 From: Luiz Capitulino Date: Wed, 7 Oct 2009 13:42:00 -0300 Message-Id: <1254933724-22485-15-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254933724-22485-1-git-send-email-lcapitulino@redhat.com> References: <1254933724-22485-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com 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 --- 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