summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-01-20 13:07:35 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-26 14:55:11 -0600
commit81a1b45ac7a3a2d4536b3827defdcbabdb221051 (patch)
tree3fb7781b5b45e48fd2bba2e1979a5ff4d83ad62e
parent64a34bb14c0e358a6b2f14805e59ef25bf62d6d5 (diff)
downloadqemu-81a1b45ac7a3a2d4536b3827defdcbabdb221051.tar.gz
monitor: convert do_cpu_set() to QObject, QError
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--monitor.c4
-rw-r--r--qemu-monitor.hx3
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