From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvKNp-0001is-5d for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvKNk-0001eW-Ci for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:56 -0400 Received: from [199.232.76.173] (port=45751 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKNk-0001eJ-4C for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51308) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvKNj-00075l-J4 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:51 -0400 From: Luiz Capitulino Date: Tue, 6 Oct 2009 21:27:08 -0300 Message-Id: <1254875232-25012-12-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> References: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 11/15] 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 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 198f0fc..094b090 100644 --- a/monitor.c +++ b/monitor.c @@ -615,7 +615,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 }; @@ -631,7 +634,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 eef0c8e..935e8ea 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -311,7 +311,7 @@ ETEXI .name = "c|cont", .args_type = "", .handler = do_cont, - .user_print = NULL, + .user_print = monitor_user_noop, .params = "", .help = "resume emulation", }, -- 1.6.5.rc2.17.gdbc1b