Merge remote-tracking branch 'qmp/queue/qmp' into staging

Conflicts:
	ui/spice-core.c
This commit is contained in:
Anthony Liguori 2011-10-31 11:02:29 -05:00
commit 96b3d73f5a
27 changed files with 1623 additions and 1066 deletions

View file

@ -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