diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:02:29 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:02:29 -0500 |
commit | 96b3d73f5ad5838690d42666c566a48be9d173dc (patch) | |
tree | ff8308c6bb8494acc5f698308fded86cc5cd4e67 /hmp-commands.hx | |
parent | Merge remote-tracking branch 'qemu-kvm-tmp/uq/master' into staging (diff) | |
parent | Drop qemu-objects.h from modules that don't require it (diff) | |
download | qemu-kvm-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.gz qemu-kvm-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.bz2 qemu-kvm-96b3d73f5ad5838690d42666c566a48be9d173dc.zip |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Conflicts:
ui/spice-core.c
Diffstat (limited to 'hmp-commands.hx')
-rw-r--r-- | hmp-commands.hx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index e1812676e..089c1ac23 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -587,8 +587,7 @@ ETEXI .args_type = "index:i", .params = "index", .help = "set the default CPU", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_cpu_set, + .mhandler.cmd = hmp_cpu, }, STEXI |