From 81a1b45ac7a3a2d4536b3827defdcbabdb221051 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 20 Jan 2010 13:07:35 +0100 Subject: [PATCH] monitor: convert do_cpu_set() to QObject, QError Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- monitor.c | 4 ++-- qemu-monitor.hx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 614d2d691b..ae3300b8c4 100644 --- a/monitor.c +++ b/monitor.c @@ -807,11 +807,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 1aa78186ba..415734a464 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