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

@ -331,10 +331,7 @@ EQMP
{
.name = "cpu",
.args_type = "index:i",
.params = "index",
.help = "set the default CPU",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_cpu_set,
.mhandler.cmd_new = qmp_marshal_input_cpu,
},
SQMP
@ -1202,6 +1199,12 @@ Example:
EQMP
{
.name = "query-block",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_block,
},
SQMP
query-blockstats
----------------
@ -1309,6 +1312,12 @@ Example:
EQMP
{
.name = "query-blockstats",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_blockstats,
},
SQMP
query-cpus
----------
@ -1351,6 +1360,12 @@ Example:
EQMP
{
.name = "query-cpus",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_cpus,
},
SQMP
query-pci
---------
@ -1562,6 +1577,12 @@ Note: This example has been shortened as the real response is too long.
EQMP
{
.name = "query-pci",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_pci,
},
SQMP
query-kvm
---------
@ -1664,6 +1685,12 @@ Example:
EQMP
{
.name = "query-mice",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_mice,
},
SQMP
query-vnc
---------
@ -1721,6 +1748,12 @@ Example:
EQMP
{
.name = "query-vnc",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_vnc,
},
SQMP
query-spice
-----------
@ -1791,6 +1824,14 @@ Example:
EQMP
#if defined(CONFIG_SPICE)
{
.name = "query-spice",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_spice,
},
#endif
SQMP
query-name
----------
@ -1914,6 +1955,12 @@ Examples:
EQMP
{
.name = "query-migrate",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_migrate,
},
SQMP
query-balloon
-------------
@ -1949,3 +1996,8 @@ Example:
EQMP
{
.name = "query-balloon",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_balloon,
},