From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXZLe-0002i4-IW for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:07:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXZLZ-0002er-RR for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:07:46 -0500 Received: from [199.232.76.173] (port=55589 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXZLZ-0002ei-IT for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:07:41 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:46855) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXZLZ-0007ij-15 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:07:41 -0500 Received: from blackfin.pond.sub.org (pD9E3BC04.dip.t-dialin.net [217.227.188.4]) by oxygen.pond.sub.org (Postfix) with ESMTPA id BB9A72E2AEA for ; Wed, 20 Jan 2010 13:07:36 +0100 (CET) From: Markus Armbruster Date: Wed, 20 Jan 2010 13:07:35 +0100 Message-Id: <1263989255-13755-7-git-send-email-armbru@redhat.com> In-Reply-To: <1263989255-13755-1-git-send-email-armbru@redhat.com> References: <1263989255-13755-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/6] monitor: convert do_cpu_set() to QObject, QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster --- monitor.c | 4 ++-- qemu-monitor.hx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 816f6fd..b9166c3 100644 --- a/monitor.c +++ b/monitor.c @@ -808,11 +808,11 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data) *ret_data = QOBJECT(cpu_list); } -static void do_cpu_set(Monitor *mon, const QDict *qdict) +static void do_cpu_set(Monitor *mon, const QDict *qdict, QObject **ret_data) { int index = qdict_get_int(qdict, "index"); if (mon_set_cpu(index) < 0) - monitor_printf(mon, "Invalid CPU index\n"); + qemu_error_new(QERR_INVALID_CPU_INDEX); } static void do_info_jit(Monitor *mon) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 1aa7818..415734a 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -573,7 +573,8 @@ ETEXI .args_type = "index:i", .params = "index", .help = "set the default CPU", - .mhandler.cmd = do_cpu_set, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_cpu_set, }, STEXI -- 1.6.6