From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVp0r-0004mB-Ln for qemu-devel@nongnu.org; Fri, 15 Jan 2010 11:27:05 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVp0o-0004jf-05 for qemu-devel@nongnu.org; Fri, 15 Jan 2010 11:27:05 -0500 Received: from [199.232.76.173] (port=52175 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVp0n-0004jY-LE for qemu-devel@nongnu.org; Fri, 15 Jan 2010 11:27:01 -0500 Received: from mx20.gnu.org ([199.232.41.8]:28981) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NVp0l-0002I5-IE for qemu-devel@nongnu.org; Fri, 15 Jan 2010 11:27:01 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVozP-0003bW-R9 for qemu-devel@nongnu.org; Fri, 15 Jan 2010 11:25:36 -0500 Received: from blackfin.pond.sub.org (pD9E3B8FA.dip.t-dialin.net [217.227.184.250]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 285EF2DD2EA for ; Fri, 15 Jan 2010 17:25:30 +0100 (CET) From: Markus Armbruster Date: Fri, 15 Jan 2010 17:25:29 +0100 Message-Id: <1263572729-14813-7-git-send-email-armbru@redhat.com> In-Reply-To: <1263572729-14813-1-git-send-email-armbru@redhat.com> References: <1263572729-14813-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 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 6664a04..5f0a54c 100644 --- a/monitor.c +++ b/monitor.c @@ -797,11 +797,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.5.2