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 | 549f808b577c7709aeaa0244972d3ae28fad97d2 (diff) | |
| parent | f795e743bd026471bcf7952d272424f1fd32e83b (diff) | |
| download | focaccia-qemu-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.gz focaccia-qemu-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 e1812676e3..089c1ac23d 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 |