From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtNwP-0007gp-NZ for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtNwK-0007XZ-2e for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:36 -0400 Received: from [199.232.76.173] (port=54693 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtNwJ-0007Wr-Ot for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtNwJ-0003eU-50 for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:31 -0400 From: Luiz Capitulino Date: Thu, 1 Oct 2009 12:50:40 -0300 Message-Id: <1254412245-10452-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254412245-10452-1-git-send-email-lcapitulino@redhat.com> References: <1254412245-10452-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 09/14] monitor: Convert do_system_reset() 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 Signed-off-by: Luiz Capitulino --- monitor.c | 6 +++++- qemu-monitor.hx | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 3e96792..f2f0c74 100644 --- a/monitor.c +++ b/monitor.c @@ -1329,7 +1329,11 @@ static void do_boot_set(Monitor *mon, const QDict *qdict) } } -static void do_system_reset(Monitor *mon, const QDict *qdict) +/** + * do_system_reset(): Issue a machine reset + */ +static void do_system_reset(Monitor *mon, const QDict *qdict, + QObject **ret_data, MonitorError *error) { qemu_system_reset_request(); } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 91bfe37..4f8e678 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -507,8 +507,8 @@ ETEXI .name = "system_reset", .args_type = "", .handler = do_system_reset, - .user_print = NULL, - .user_error = NULL, + .user_print = monitor_user_noop, + .user_error = monitor_error_noop, .params = "", .help = "reset the system" }, -- 1.6.5.rc2