x86: use new method to correct reset sequence

[qemu.git] / qmp-commands.hx

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 06639248f23b8c3b9f775cd4cd08815e79efe4da..d2ba800d5effaddcae4c437452ef1f67c0aaaaa9 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -63,7 +63,7 @@ EQMP
     {
         .name       = "quit",
         .args_type  = "",
     {
         .name       = "quit",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_quit,
+        .mhandler.cmd_new = qmp_marshal_quit,

     },
 
 SQMP
     },
 
 SQMP


@@ -84,7 +84,7 @@ EQMP
     {
         .name       = "eject",
         .args_type  = "force:-f,device:B",
     {
         .name       = "eject",
         .args_type  = "force:-f,device:B",

-        .mhandler.cmd_new = qmp_marshal_input_eject,
+        .mhandler.cmd_new = qmp_marshal_eject,

     },
 
 SQMP
     },
 
 SQMP


@@ -110,7 +110,7 @@ EQMP
     {
         .name       = "change",
         .args_type  = "device:B,target:F,arg:s?",
     {
         .name       = "change",
         .args_type  = "device:B,target:F,arg:s?",

-        .mhandler.cmd_new = qmp_marshal_input_change,
+        .mhandler.cmd_new = qmp_marshal_change,

     },
 
 SQMP
     },
 
 SQMP


@@ -146,7 +146,7 @@ EQMP
     {
         .name       = "screendump",
         .args_type  = "filename:F",
     {
         .name       = "screendump",
         .args_type  = "filename:F",

-        .mhandler.cmd_new = qmp_marshal_input_screendump,
+        .mhandler.cmd_new = qmp_marshal_screendump,

     },
 
 SQMP
     },
 
 SQMP


@@ -169,7 +169,7 @@ EQMP
     {
         .name       = "stop",
         .args_type  = "",
     {
         .name       = "stop",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_stop,
+        .mhandler.cmd_new = qmp_marshal_stop,

     },
 
 SQMP
     },
 
 SQMP


@@ -190,7 +190,7 @@ EQMP
     {
         .name       = "cont",
         .args_type  = "",
     {
         .name       = "cont",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_cont,
+        .mhandler.cmd_new = qmp_marshal_cont,

     },
 
 SQMP
     },
 
 SQMP


@@ -211,7 +211,7 @@ EQMP
     {
         .name       = "system_wakeup",
         .args_type  = "",
     {
         .name       = "system_wakeup",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_system_wakeup,
+        .mhandler.cmd_new = qmp_marshal_system_wakeup,

     },
 
 SQMP
     },
 
 SQMP


@@ -232,7 +232,7 @@ EQMP
     {
         .name       = "system_reset",
         .args_type  = "",
     {
         .name       = "system_reset",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_system_reset,
+        .mhandler.cmd_new = qmp_marshal_system_reset,

     },
 
 SQMP
     },
 
 SQMP


@@ -253,7 +253,7 @@ EQMP
     {
         .name       = "system_powerdown",
         .args_type  = "",
     {
         .name       = "system_powerdown",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_system_powerdown,
+        .mhandler.cmd_new = qmp_marshal_system_powerdown,

     },
 
 SQMP
     },
 
 SQMP


@@ -276,8 +276,7 @@ EQMP
         .args_type  = "device:O",
         .params     = "driver[,prop=value][,...]",
         .help       = "add device, like -device on the command line",
         .args_type  = "device:O",
         .params     = "driver[,prop=value][,...]",
         .help       = "add device, like -device on the command line",

-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_device_add,
+        .mhandler.cmd_new = qmp_device_add,

     },
 
 SQMP
     },
 
 SQMP


@@ -311,7 +310,7 @@ EQMP
     {
         .name       = "device_del",
         .args_type  = "id:s",
     {
         .name       = "device_del",
         .args_type  = "id:s",

-        .mhandler.cmd_new = qmp_marshal_input_device_del,
+        .mhandler.cmd_new = qmp_marshal_device_del,

     },
 
 SQMP
     },
 
 SQMP


@@ -322,19 +321,24 @@ Remove a device.
 
 Arguments:
 
 
 Arguments:
 

-- "id": the device's ID (json-string)
+- "id": the device's ID or QOM path (json-string)

 
 Example:
 
 -> { "execute": "device_del", "arguments": { "id": "net1" } }
 <- { "return": {} }
 
 
 Example:
 
 -> { "execute": "device_del", "arguments": { "id": "net1" } }
 <- { "return": {} }
 

+Example:
+
+-> { "execute": "device_del", "arguments": { "id": "/machine/peripheral-anon/device[0]" } }
+<- { "return": {} }
+

 EQMP
 
     {
         .name       = "send-key",
 EQMP
 
     {
         .name       = "send-key",

-        .args_type  = "keys:O,hold-time:i?",
-        .mhandler.cmd_new = qmp_marshal_input_send_key,
+        .args_type  = "keys:q,hold-time:i?",
+        .mhandler.cmd_new = qmp_marshal_send_key,

     },
 
 SQMP
     },
 
 SQMP


@@ -365,7 +369,7 @@ EQMP
     {
         .name       = "cpu",
         .args_type  = "index:i",
     {
         .name       = "cpu",
         .args_type  = "index:i",

-        .mhandler.cmd_new = qmp_marshal_input_cpu,
+        .mhandler.cmd_new = qmp_marshal_cpu,

     },
 
 SQMP
     },
 
 SQMP


@@ -390,7 +394,7 @@ EQMP
     {
         .name       = "cpu-add",
         .args_type  = "id:i",
     {
         .name       = "cpu-add",
         .args_type  = "id:i",

-        .mhandler.cmd_new = qmp_marshal_input_cpu_add,
+        .mhandler.cmd_new = qmp_marshal_cpu_add,

     },
 
 SQMP
     },
 
 SQMP


@@ -413,7 +417,7 @@ EQMP
     {
         .name       = "memsave",
         .args_type  = "val:l,size:i,filename:s,cpu:i?",
     {
         .name       = "memsave",
         .args_type  = "val:l,size:i,filename:s,cpu:i?",

-        .mhandler.cmd_new = qmp_marshal_input_memsave,
+        .mhandler.cmd_new = qmp_marshal_memsave,

     },
 
 SQMP
     },
 
 SQMP


@@ -442,7 +446,7 @@ EQMP
     {
         .name       = "pmemsave",
         .args_type  = "val:l,size:i,filename:s",
     {
         .name       = "pmemsave",
         .args_type  = "val:l,size:i,filename:s",

-        .mhandler.cmd_new = qmp_marshal_input_pmemsave,
+        .mhandler.cmd_new = qmp_marshal_pmemsave,

     },
 
 SQMP
     },
 
 SQMP


@@ -470,7 +474,7 @@ EQMP
     {
         .name       = "inject-nmi",
         .args_type  = "",
     {
         .name       = "inject-nmi",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_inject_nmi,
+        .mhandler.cmd_new = qmp_marshal_inject_nmi,

     },
 
 SQMP
     },
 
 SQMP


@@ -493,7 +497,7 @@ EQMP
     {
         .name       = "ringbuf-write",
         .args_type  = "device:s,data:s,format:s?",
     {
         .name       = "ringbuf-write",
         .args_type  = "device:s,data:s,format:s?",

-        .mhandler.cmd_new = qmp_marshal_input_ringbuf_write,
+        .mhandler.cmd_new = qmp_marshal_ringbuf_write,

     },
 
 SQMP
     },
 
 SQMP


@@ -524,7 +528,7 @@ EQMP
     {
         .name       = "ringbuf-read",
         .args_type  = "device:s,size:i,format:s?",
     {
         .name       = "ringbuf-read",
         .args_type  = "device:s,size:i,format:s?",

-        .mhandler.cmd_new = qmp_marshal_input_ringbuf_read,
+        .mhandler.cmd_new = qmp_marshal_ringbuf_read,

     },
 
 SQMP
     },
 
 SQMP


@@ -560,7 +564,7 @@ EQMP
     {
         .name       = "xen-save-devices-state",
         .args_type  = "filename:F",
     {
         .name       = "xen-save-devices-state",
         .args_type  = "filename:F",

-    .mhandler.cmd_new = qmp_marshal_input_xen_save_devices_state,
+    .mhandler.cmd_new = qmp_marshal_xen_save_devices_state,

     },
 
 SQMP
     },
 
 SQMP


@@ -587,7 +591,7 @@ EQMP
     {
         .name       = "xen-set-global-dirty-log",
         .args_type  = "enable:b",
     {
         .name       = "xen-set-global-dirty-log",
         .args_type  = "enable:b",

-        .mhandler.cmd_new = qmp_marshal_input_xen_set_global_dirty_log,
+        .mhandler.cmd_new = qmp_marshal_xen_set_global_dirty_log,

     },
 
 SQMP
     },
 
 SQMP


@@ -611,7 +615,7 @@ EQMP
     {
         .name       = "migrate",
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
     {
         .name       = "migrate",
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",

-        .mhandler.cmd_new = qmp_marshal_input_migrate,
+        .mhandler.cmd_new = qmp_marshal_migrate,

     },
 
 SQMP
     },
 
 SQMP


@@ -644,7 +648,7 @@ EQMP
     {
         .name       = "migrate_cancel",
         .args_type  = "",
     {
         .name       = "migrate_cancel",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_migrate_cancel,
+        .mhandler.cmd_new = qmp_marshal_migrate_cancel,

     },
 
 SQMP
     },
 
 SQMP


@@ -665,7 +669,7 @@ EQMP
     {
         .name       = "migrate-incoming",
         .args_type  = "uri:s",
     {
         .name       = "migrate-incoming",
         .args_type  = "uri:s",

-        .mhandler.cmd_new = qmp_marshal_input_migrate_incoming,
+        .mhandler.cmd_new = qmp_marshal_migrate_incoming,

     },
 
 SQMP
     },
 
 SQMP


@@ -687,13 +691,13 @@ Notes:
 
 (1) QEMU must be started with -incoming defer to allow migrate-incoming to
     be used
 
 (1) QEMU must be started with -incoming defer to allow migrate-incoming to
     be used

-(2) The uri format is the same as to -incoming
+(2) The uri format is the same as for -incoming

 
 EQMP
     {
         .name       = "migrate-set-cache-size",
         .args_type  = "value:o",
 
 EQMP
     {
         .name       = "migrate-set-cache-size",
         .args_type  = "value:o",

-        .mhandler.cmd_new = qmp_marshal_input_migrate_set_cache_size,
+        .mhandler.cmd_new = qmp_marshal_migrate_set_cache_size,

     },
 
 SQMP
     },
 
 SQMP


@@ -716,7 +720,7 @@ EQMP
     {
         .name       = "query-migrate-cache-size",
         .args_type  = "",
     {
         .name       = "query-migrate-cache-size",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_migrate_cache_size,
+        .mhandler.cmd_new = qmp_marshal_query_migrate_cache_size,

     },
 
 SQMP
     },
 
 SQMP


@@ -738,7 +742,7 @@ EQMP
     {
         .name       = "migrate_set_speed",
         .args_type  = "value:o",
     {
         .name       = "migrate_set_speed",
         .args_type  = "value:o",

-        .mhandler.cmd_new = qmp_marshal_input_migrate_set_speed,
+        .mhandler.cmd_new = qmp_marshal_migrate_set_speed,

     },
 
 SQMP
     },
 
 SQMP


@@ -761,7 +765,7 @@ EQMP
     {
         .name       = "migrate_set_downtime",
         .args_type  = "value:T",
     {
         .name       = "migrate_set_downtime",
         .args_type  = "value:T",

-        .mhandler.cmd_new = qmp_marshal_input_migrate_set_downtime,
+        .mhandler.cmd_new = qmp_marshal_migrate_set_downtime,

     },
 
 SQMP
     },
 
 SQMP


@@ -785,25 +789,23 @@ EQMP
         .name       = "client_migrate_info",
         .args_type  = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
         .params     = "protocol hostname port tls-port cert-subject",
         .name       = "client_migrate_info",
         .args_type  = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
         .params     = "protocol hostname port tls-port cert-subject",

-        .help       = "send migration info to spice/vnc client",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_async = client_migrate_info,
-        .flags      = MONITOR_CMD_ASYNC,
+        .help       = "set migration information for remote display",
+        .mhandler.cmd_new = qmp_marshal_client_migrate_info,

     },
 
 SQMP
 client_migrate_info
     },
 
 SQMP
 client_migrate_info

-------------------
+-------------------

 
 

-Set the spice/vnc connection info for the migration target.  The spice/vnc
-server will ask the spice/vnc client to automatically reconnect using the
-new parameters (if specified) once the vm migration finished successfully.
+Set migration information for remote display.  This makes the server
+ask the client to automatically reconnect using the new parameters
+once migration finished successfully.  Only implemented for SPICE.

 
 Arguments:
 
 
 Arguments:
 

-- "protocol":     protocol: "spice" or "vnc" (json-string)
+- "protocol":     must be "spice" (json-string)

 - "hostname":     migration target hostname (json-string)
 - "hostname":     migration target hostname (json-string)

-- "port":         spice/vnc tcp port for plaintext channels (json-int, optional)
+- "port":         spice tcp port for plaintext channels (json-int, optional)

 - "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
 - "cert-subject": server certificate subject (json-string, optional)
 
 - "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
 - "cert-subject": server certificate subject (json-string, optional)
 


@@ -822,8 +824,7 @@ EQMP
         .args_type  = "paging:b,protocol:s,begin:i?,end:i?,format:s?",
         .params     = "-p protocol [begin] [length] [format]",
         .help       = "dump guest memory to file",
         .args_type  = "paging:b,protocol:s,begin:i?,end:i?,format:s?",
         .params     = "-p protocol [begin] [length] [format]",
         .help       = "dump guest memory to file",

-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = qmp_marshal_input_dump_guest_memory,
+        .mhandler.cmd_new = qmp_marshal_dump_guest_memory,

     },
 
 SQMP
     },
 
 SQMP


@@ -859,7 +860,7 @@ EQMP
     {
         .name       = "query-dump-guest-memory-capability",
         .args_type  = "",
     {
         .name       = "query-dump-guest-memory-capability",
         .args_type  = "",

-    .mhandler.cmd_new = qmp_marshal_input_query_dump_guest_memory_capability,
+    .mhandler.cmd_new = qmp_marshal_query_dump_guest_memory_capability,

     },
 
 SQMP
     },
 
 SQMP


@@ -874,6 +875,31 @@ Example:
 <- { "return": { "formats":
                     ["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] }
 
 <- { "return": { "formats":
                     ["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] }
 

+EQMP
+
+#if defined TARGET_S390X
+    {
+        .name       = "dump-skeys",
+        .args_type  = "filename:F",
+        .mhandler.cmd_new = qmp_marshal_dump_skeys,
+    },
+#endif
+
+SQMP
+dump-skeys
+----------
+
+Save guest storage keys to file.
+
+Arguments:
+
+- "filename": file path (json-string)
+
+Example:
+
+-> { "execute": "dump-skeys", "arguments": { "filename": "/tmp/skeys" } }
+<- { "return": {} }
+

 EQMP
 
     {
 EQMP
 
     {


@@ -896,7 +922,9 @@ Arguments:
 
 Example:
 
 
 Example:
 

--> { "execute": "netdev_add", "arguments": { "type": "user", "id": "netdev1" } }
+-> { "execute": "netdev_add",
+     "arguments": { "type": "user", "id": "netdev1",
+                    "dnssearch": "example.org" } }

 <- { "return": {} }
 
 Note: The supported device options are the same ones supported by the '-netdev'
 <- { "return": {} }
 
 Note: The supported device options are the same ones supported by the '-netdev'


@@ -908,7 +936,7 @@ EQMP
     {
         .name       = "netdev_del",
         .args_type  = "id:s",
     {
         .name       = "netdev_del",
         .args_type  = "id:s",

-        .mhandler.cmd_new = qmp_marshal_input_netdev_del,
+        .mhandler.cmd_new = qmp_marshal_netdev_del,

     },
 
 SQMP
     },
 
 SQMP


@@ -932,7 +960,7 @@ EQMP
     {
         .name       = "object-add",
         .args_type  = "qom-type:s,id:s,props:q?",
     {
         .name       = "object-add",
         .args_type  = "qom-type:s,id:s,props:q?",

-        .mhandler.cmd_new = qmp_object_add,
+        .mhandler.cmd_new = qmp_marshal_object_add,

     },
 
 SQMP
     },
 
 SQMP


@@ -958,7 +986,7 @@ EQMP
     {
         .name       = "object-del",
         .args_type  = "id:s",
     {
         .name       = "object-del",
         .args_type  = "id:s",

-        .mhandler.cmd_new = qmp_marshal_input_object_del,
+        .mhandler.cmd_new = qmp_marshal_object_del,

     },
 
 SQMP
     },
 
 SQMP


@@ -983,7 +1011,7 @@ EQMP
     {
         .name       = "block_resize",
         .args_type  = "device:s?,node-name:s?,size:o",
     {
         .name       = "block_resize",
         .args_type  = "device:s?,node-name:s?,size:o",

-        .mhandler.cmd_new = qmp_marshal_input_block_resize,
+        .mhandler.cmd_new = qmp_marshal_block_resize,

     },
 
 SQMP
     },
 
 SQMP


@@ -1008,13 +1036,50 @@ EQMP
     {
         .name       = "block-stream",
         .args_type  = "device:B,base:s?,speed:o?,backing-file:s?,on-error:s?",
     {
         .name       = "block-stream",
         .args_type  = "device:B,base:s?,speed:o?,backing-file:s?,on-error:s?",

-        .mhandler.cmd_new = qmp_marshal_input_block_stream,
+        .mhandler.cmd_new = qmp_marshal_block_stream,

     },
 
     },
 

+SQMP
+block-stream
+------------
+
+Copy data from a backing file into a block device.
+
+Arguments:
+
+- "device": The device's ID, must be unique (json-string)
+- "base": The file name of the backing image above which copying starts
+          (json-string, optional)
+- "backing-file": The backing file string to write into the active layer. This
+                  filename is not validated.
+
+                  If a pathname string is such that it cannot be resolved by
+                  QEMU, that means that subsequent QMP or HMP commands must use
+                  node-names for the image in question, as filename lookup
+                  methods will fail.
+
+                  If not specified, QEMU will automatically determine the
+                  backing file string to use, or error out if there is no
+                  obvious choice.  Care should be taken when specifying the
+                  string, to specify a valid filename or protocol.
+                  (json-string, optional) (Since 2.1)
+- "speed":  the maximum speed, in bytes per second (json-int, optional)
+- "on-error": the action to take on an error (default 'report').  'stop' and
+              'enospc' can only be used if the block device supports io-status.
+              (json-string, optional) (Since 2.1)
+
+Example:
+
+-> { "execute": "block-stream", "arguments": { "device": "virtio0",
+                                               "base": "/tmp/master.qcow2" } }
+<- { "return": {} }
+
+EQMP
+

     {
         .name       = "block-commit",
         .args_type  = "device:B,base:s?,top:s?,backing-file:s?,speed:o?",
     {
         .name       = "block-commit",
         .args_type  = "device:B,base:s?,top:s?,backing-file:s?,speed:o?",

-        .mhandler.cmd_new = qmp_marshal_input_block_commit,
+        .mhandler.cmd_new = qmp_marshal_block_commit,

     },
 
 SQMP
     },
 
 SQMP


@@ -1077,8 +1142,8 @@ EQMP
     {
         .name       = "drive-backup",
         .args_type  = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"
     {
         .name       = "drive-backup",
         .args_type  = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"

-                      "on-source-error:s?,on-target-error:s?",
-        .mhandler.cmd_new = qmp_marshal_input_drive_backup,
+                      "bitmap:s?,on-source-error:s?,on-target-error:s?",
+        .mhandler.cmd_new = qmp_marshal_drive_backup,

     },
 
 SQMP
     },
 
 SQMP


@@ -1104,8 +1169,10 @@ Arguments:
             (json-string, optional)
 - "sync": what parts of the disk image should be copied to the destination;
   possibilities include "full" for all the disk, "top" for only the sectors
             (json-string, optional)
 - "sync": what parts of the disk image should be copied to the destination;
   possibilities include "full" for all the disk, "top" for only the sectors

-  allocated in the topmost image, or "none" to only replicate new I/O
-  (MirrorSyncMode).
+  allocated in the topmost image, "incremental" for only the dirty sectors in
+  the bitmap, or "none" to only replicate new I/O (MirrorSyncMode).
+- "bitmap": dirty bitmap name for sync==incremental. Must be present if sync
+            is "incremental", must NOT be present otherwise.

 - "mode": whether and how QEMU should create a new image
           (NewImageMode, optional, default 'absolute-paths')
 - "speed": the maximum speed, in bytes per second (json-int, optional)
 - "mode": whether and how QEMU should create a new image
           (NewImageMode, optional, default 'absolute-paths')
 - "speed": the maximum speed, in bytes per second (json-int, optional)


@@ -1130,7 +1197,7 @@ EQMP
         .name       = "blockdev-backup",
         .args_type  = "sync:s,device:B,target:B,speed:i?,"
                       "on-source-error:s?,on-target-error:s?",
         .name       = "blockdev-backup",
         .args_type  = "sync:s,device:B,target:B,speed:i?,"
                       "on-source-error:s?,on-target-error:s?",

-        .mhandler.cmd_new = qmp_marshal_input_blockdev_backup,
+        .mhandler.cmd_new = qmp_marshal_blockdev_backup,

     },
 
 SQMP
     },
 
 SQMP


@@ -1170,33 +1237,33 @@ EQMP
     {
         .name       = "block-job-set-speed",
         .args_type  = "device:B,speed:o",
     {
         .name       = "block-job-set-speed",
         .args_type  = "device:B,speed:o",

-        .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed,
+        .mhandler.cmd_new = qmp_marshal_block_job_set_speed,

     },
 
     {
         .name       = "block-job-cancel",
         .args_type  = "device:B,force:b?",
     },
 
     {
         .name       = "block-job-cancel",
         .args_type  = "device:B,force:b?",

-        .mhandler.cmd_new = qmp_marshal_input_block_job_cancel,
+        .mhandler.cmd_new = qmp_marshal_block_job_cancel,

     },
     {
         .name       = "block-job-pause",
         .args_type  = "device:B",
     },
     {
         .name       = "block-job-pause",
         .args_type  = "device:B",

-        .mhandler.cmd_new = qmp_marshal_input_block_job_pause,
+        .mhandler.cmd_new = qmp_marshal_block_job_pause,

     },
     {
         .name       = "block-job-resume",
         .args_type  = "device:B",
     },
     {
         .name       = "block-job-resume",
         .args_type  = "device:B",

-        .mhandler.cmd_new = qmp_marshal_input_block_job_resume,
+        .mhandler.cmd_new = qmp_marshal_block_job_resume,

     },
     {
         .name       = "block-job-complete",
         .args_type  = "device:B",
     },
     {
         .name       = "block-job-complete",
         .args_type  = "device:B",

-        .mhandler.cmd_new = qmp_marshal_input_block_job_complete,
+        .mhandler.cmd_new = qmp_marshal_block_job_complete,

     },
     {
         .name       = "transaction",
         .args_type  = "actions:q",
     },
     {
         .name       = "transaction",
         .args_type  = "actions:q",

-        .mhandler.cmd_new = qmp_marshal_input_transaction,
+        .mhandler.cmd_new = qmp_marshal_transaction,

     },
 
 SQMP
     },
 
 SQMP


@@ -1270,12 +1337,97 @@ Example:
                                          "name": "snapshot0" } } ] } }
 <- { "return": {} }
 
                                          "name": "snapshot0" } } ] } }
 <- { "return": {} }
 

+EQMP
+
+    {
+        .name       = "block-dirty-bitmap-add",
+        .args_type  = "node:B,name:s,granularity:i?",
+        .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_add,
+    },
+
+SQMP
+
+block-dirty-bitmap-add
+----------------------
+Since 2.4
+
+Create a dirty bitmap with a name on the device, and start tracking the writes.
+
+Arguments:
+
+- "node": device/node on which to create dirty bitmap (json-string)
+- "name": name of the new dirty bitmap (json-string)
+- "granularity": granularity to track writes with (int, optional)
+
+Example:
+
+-> { "execute": "block-dirty-bitmap-add", "arguments": { "node": "drive0",
+                                                   "name": "bitmap0" } }
+<- { "return": {} }
+
+EQMP
+
+    {
+        .name       = "block-dirty-bitmap-remove",
+        .args_type  = "node:B,name:s",
+        .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_remove,
+    },
+
+SQMP
+
+block-dirty-bitmap-remove
+-------------------------
+Since 2.4
+
+Stop write tracking and remove the dirty bitmap that was created with
+block-dirty-bitmap-add.
+
+Arguments:
+
+- "node": device/node on which to remove dirty bitmap (json-string)
+- "name": name of the dirty bitmap to remove (json-string)
+
+Example:
+
+-> { "execute": "block-dirty-bitmap-remove", "arguments": { "node": "drive0",
+                                                      "name": "bitmap0" } }
+<- { "return": {} }
+
+EQMP
+
+    {
+        .name       = "block-dirty-bitmap-clear",
+        .args_type  = "node:B,name:s",
+        .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_clear,
+    },
+
+SQMP
+
+block-dirty-bitmap-clear
+------------------------
+Since 2.4
+
+Reset the dirty bitmap associated with a node so that an incremental backup
+from this point in time forward will only backup clusters modified after this
+clear operation.
+
+Arguments:
+
+- "node": device/node on which to remove dirty bitmap (json-string)
+- "name": name of the dirty bitmap to remove (json-string)
+
+Example:
+
+-> { "execute": "block-dirty-bitmap-clear", "arguments": { "node": "drive0",
+                                                           "name": "bitmap0" } }
+<- { "return": {} }
+

 EQMP
 
     {
         .name       = "blockdev-snapshot-sync",
         .args_type  = "device:s?,node-name:s?,snapshot-file:s,snapshot-node-name:s?,format:s?,mode:s?",
 EQMP
 
     {
         .name       = "blockdev-snapshot-sync",
         .args_type  = "device:s?,node-name:s?,snapshot-file:s,snapshot-node-name:s?,format:s?,mode:s?",

-        .mhandler.cmd_new = qmp_marshal_input_blockdev_snapshot_sync,
+        .mhandler.cmd_new = qmp_marshal_blockdev_snapshot_sync,

     },
 
 SQMP
     },
 
 SQMP


@@ -1311,7 +1463,7 @@ EQMP
     {
         .name       = "blockdev-snapshot-internal-sync",
         .args_type  = "device:B,name:s",
     {
         .name       = "blockdev-snapshot-internal-sync",
         .args_type  = "device:B,name:s",

-        .mhandler.cmd_new = qmp_marshal_input_blockdev_snapshot_internal_sync,
+        .mhandler.cmd_new = qmp_marshal_blockdev_snapshot_internal_sync,

     },
 
 SQMP
     },
 
 SQMP


@@ -1341,7 +1493,7 @@ EQMP
         .name       = "blockdev-snapshot-delete-internal-sync",
         .args_type  = "device:B,id:s?,name:s?",
         .mhandler.cmd_new =
         .name       = "blockdev-snapshot-delete-internal-sync",
         .args_type  = "device:B,id:s?,name:s?",
         .mhandler.cmd_new =

-                      qmp_marshal_input_blockdev_snapshot_delete_internal_sync,
+                      qmp_marshal_blockdev_snapshot_delete_internal_sync,

     },
 
 SQMP
     },
 
 SQMP


@@ -1383,8 +1535,9 @@ EQMP
         .args_type  = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"
                       "node-name:s?,replaces:s?,"
                       "on-source-error:s?,on-target-error:s?,"
         .args_type  = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"
                       "node-name:s?,replaces:s?,"
                       "on-source-error:s?,on-target-error:s?,"

+                      "unmap:b?,"

                       "granularity:i?,buf-size:i?",
                       "granularity:i?,buf-size:i?",

-        .mhandler.cmd_new = qmp_marshal_input_drive_mirror,
+        .mhandler.cmd_new = qmp_marshal_drive_mirror,

     },
 
 SQMP
     },
 
 SQMP


@@ -1422,6 +1575,8 @@ Arguments:
   (BlockdevOnError, default 'report')
 - "on-target-error": the action to take on an error on the target
   (BlockdevOnError, default 'report')
   (BlockdevOnError, default 'report')
 - "on-target-error": the action to take on an error on the target
   (BlockdevOnError, default 'report')

+- "unmap": whether the target sectors should be discarded where source has only
+  zeroes. (json-bool, optional, default true)

 
 The default value of the granularity is the image cluster size clamped
 between 4096 and 65536, if the image format defines one.  If the format
 
 The default value of the granularity is the image cluster size clamped
 between 4096 and 65536, if the image format defines one.  If the format


@@ -1442,7 +1597,7 @@ EQMP
     {
         .name       = "change-backing-file",
         .args_type  = "device:s,image-node-name:s,backing-file:s",
     {
         .name       = "change-backing-file",
         .args_type  = "device:s,image-node-name:s,backing-file:s",

-        .mhandler.cmd_new = qmp_marshal_input_change_backing_file,
+        .mhandler.cmd_new = qmp_marshal_change_backing_file,

     },
 
 SQMP
     },
 
 SQMP


@@ -1481,7 +1636,7 @@ EQMP
     {
         .name       = "balloon",
         .args_type  = "value:M",
     {
         .name       = "balloon",
         .args_type  = "value:M",

-        .mhandler.cmd_new = qmp_marshal_input_balloon,
+        .mhandler.cmd_new = qmp_marshal_balloon,

     },
 
 SQMP
     },
 
 SQMP


@@ -1504,7 +1659,7 @@ EQMP
     {
         .name       = "set_link",
         .args_type  = "name:s,up:b",
     {
         .name       = "set_link",
         .args_type  = "name:s,up:b",

-        .mhandler.cmd_new = qmp_marshal_input_set_link,
+        .mhandler.cmd_new = qmp_marshal_set_link,

     },
 
 SQMP
     },
 
 SQMP


@@ -1530,7 +1685,7 @@ EQMP
         .args_type  = "fdname:s",
         .params     = "getfd name",
         .help       = "receive a file descriptor via SCM rights and assign it a name",
         .args_type  = "fdname:s",
         .params     = "getfd name",
         .help       = "receive a file descriptor via SCM rights and assign it a name",

-        .mhandler.cmd_new = qmp_marshal_input_getfd,
+        .mhandler.cmd_new = qmp_marshal_getfd,

     },
 
 SQMP
     },
 
 SQMP


@@ -1563,7 +1718,7 @@ EQMP
         .args_type  = "fdname:s",
         .params     = "closefd name",
         .help       = "close a file descriptor previously passed via SCM rights",
         .args_type  = "fdname:s",
         .params     = "closefd name",
         .help       = "close a file descriptor previously passed via SCM rights",

-        .mhandler.cmd_new = qmp_marshal_input_closefd,
+        .mhandler.cmd_new = qmp_marshal_closefd,

     },
 
 SQMP
     },
 
 SQMP


@@ -1588,7 +1743,7 @@ EQMP
         .args_type  = "fdset-id:i?,opaque:s?",
         .params     = "add-fd fdset-id opaque",
         .help       = "Add a file descriptor, that was passed via SCM rights, to an fd set",
         .args_type  = "fdset-id:i?,opaque:s?",
         .params     = "add-fd fdset-id opaque",
         .help       = "Add a file descriptor, that was passed via SCM rights, to an fd set",

-        .mhandler.cmd_new = qmp_marshal_input_add_fd,
+        .mhandler.cmd_new = qmp_marshal_add_fd,

     },
 
 SQMP
     },
 
 SQMP


@@ -1627,7 +1782,7 @@ EQMP
         .args_type  = "fdset-id:i,fd:i?",
         .params     = "remove-fd fdset-id fd",
         .help       = "Remove a file descriptor from an fd set",
         .args_type  = "fdset-id:i,fd:i?",
         .params     = "remove-fd fdset-id fd",
         .help       = "Remove a file descriptor from an fd set",

-        .mhandler.cmd_new = qmp_marshal_input_remove_fd,
+        .mhandler.cmd_new = qmp_marshal_remove_fd,

     },
 
 SQMP
     },
 
 SQMP


@@ -1659,7 +1814,7 @@ EQMP
         .name       = "query-fdsets",
         .args_type  = "",
         .help       = "Return information describing all fd sets",
         .name       = "query-fdsets",
         .args_type  = "",
         .help       = "Return information describing all fd sets",

-        .mhandler.cmd_new = qmp_marshal_input_query_fdsets,
+        .mhandler.cmd_new = qmp_marshal_query_fdsets,

     },
 
 SQMP
     },
 
 SQMP


@@ -1708,7 +1863,7 @@ EQMP
     {
         .name       = "block_passwd",
         .args_type  = "device:s?,node-name:s?,password:s",
     {
         .name       = "block_passwd",
         .args_type  = "device:s?,node-name:s?,password:s",

-        .mhandler.cmd_new = qmp_marshal_input_block_passwd,
+        .mhandler.cmd_new = qmp_marshal_block_passwd,

     },
 
 SQMP
     },
 
 SQMP


@@ -1733,8 +1888,8 @@ EQMP
 
     {
         .name       = "block_set_io_throttle",
 
     {
         .name       = "block_set_io_throttle",

-        .args_type  = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,iops_size:l?",
-        .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle,
+        .args_type  = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,iops_size:l?,group:s?",
+        .mhandler.cmd_new = qmp_marshal_block_set_io_throttle,

     },
 
 SQMP
     },
 
 SQMP


@@ -1759,6 +1914,7 @@ Arguments:
 - "iops_rd_max":  read I/O operations max (json-int)
 - "iops_wr_max":  write I/O operations max (json-int)
 - "iops_size":  I/O size in bytes when limiting (json-int)
 - "iops_rd_max":  read I/O operations max (json-int)
 - "iops_wr_max":  write I/O operations max (json-int)
 - "iops_size":  I/O size in bytes when limiting (json-int)

+- "group": throttle group name (json-string)

 
 Example:
 
 
 Example:
 


@@ -1783,7 +1939,7 @@ EQMP
     {
         .name       = "set_password",
         .args_type  = "protocol:s,password:s,connected:s?",
     {
         .name       = "set_password",
         .args_type  = "protocol:s,password:s,connected:s?",

-        .mhandler.cmd_new = qmp_marshal_input_set_password,
+        .mhandler.cmd_new = qmp_marshal_set_password,

     },
 
 SQMP
     },
 
 SQMP


@@ -1809,7 +1965,7 @@ EQMP
     {
         .name       = "expire_password",
         .args_type  = "protocol:s,time:s",
     {
         .name       = "expire_password",
         .args_type  = "protocol:s,time:s",

-        .mhandler.cmd_new = qmp_marshal_input_expire_password,
+        .mhandler.cmd_new = qmp_marshal_expire_password,

     },
 
 SQMP
     },
 
 SQMP


@@ -1834,7 +1990,7 @@ EQMP
     {
         .name       = "add_client",
         .args_type  = "protocol:s,fdname:s,skipauth:b?,tls:b?",
     {
         .name       = "add_client",
         .args_type  = "protocol:s,fdname:s,skipauth:b?,tls:b?",

-        .mhandler.cmd_new = qmp_marshal_input_add_client,
+        .mhandler.cmd_new = qmp_marshal_add_client,

     },
 
 SQMP
     },
 
 SQMP


@@ -1862,8 +2018,7 @@ EQMP
         .args_type  = "",
         .params     = "",
         .help       = "enable QMP capabilities",
         .args_type  = "",
         .params     = "",
         .help       = "enable QMP capabilities",

-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_qmp_capabilities,
+        .mhandler.cmd_new = qmp_capabilities,

     },
 
 SQMP
     },
 
 SQMP


@@ -1886,7 +2041,7 @@ EQMP
     {
         .name       = "human-monitor-command",
         .args_type  = "command-line:s,cpu-index:i?",
     {
         .name       = "human-monitor-command",
         .args_type  = "command-line:s,cpu-index:i?",

-        .mhandler.cmd_new = qmp_marshal_input_human_monitor_command,
+        .mhandler.cmd_new = qmp_marshal_human_monitor_command,

     },
 
 SQMP
     },
 
 SQMP


@@ -1965,7 +2120,7 @@ EQMP
     {
         .name       = "query-version",
         .args_type  = "",
     {
         .name       = "query-version",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_version,
+        .mhandler.cmd_new = qmp_marshal_query_version,

     },
 
 SQMP
     },
 
 SQMP


@@ -2002,7 +2157,7 @@ EQMP
     {
         .name       = "query-commands",
         .args_type  = "",
     {
         .name       = "query-commands",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_commands,
+        .mhandler.cmd_new = qmp_marshal_query_commands,

     },
 
 SQMP
     },
 
 SQMP


@@ -2039,7 +2194,24 @@ EQMP
     {
         .name       = "query-events",
         .args_type  = "",
     {
         .name       = "query-events",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_events,
+        .mhandler.cmd_new = qmp_marshal_query_events,
+    },
+
+SQMP
+query-qmp-schema
+----------------
+
+Return the QMP wire schema.  The returned value is a json-array of
+named schema entities.  Entities are commands, events and various
+types.  See docs/qapi-code-gen.txt for information on their structure
+and intended use.
+
+EQMP
+
+    {
+        .name       = "query-qmp-schema",
+        .args_type  = "",
+        .mhandler.cmd_new = qmp_query_qmp_schema,

     },
 
 SQMP
     },
 
 SQMP


@@ -2084,7 +2256,7 @@ EQMP
     {
         .name       = "query-chardev",
         .args_type  = "",
     {
         .name       = "query-chardev",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_chardev,
+        .mhandler.cmd_new = qmp_marshal_query_chardev,

     },
 
 SQMP
     },
 
 SQMP


@@ -2125,7 +2297,7 @@ EQMP
     {
         .name       = "query-chardev-backends",
         .args_type  = "",
     {
         .name       = "query-chardev-backends",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_chardev_backends,
+        .mhandler.cmd_new = qmp_marshal_query_chardev_backends,

     },
 
 SQMP
     },
 
 SQMP


@@ -2154,7 +2326,7 @@ Each json-object contain the following:
          - "drv": driver format name (json-string)
              - Possible values: "blkdebug", "bochs", "cloop", "dmg",
                                 "file", "file", "ftp", "ftps", "host_cdrom",
          - "drv": driver format name (json-string)
              - Possible values: "blkdebug", "bochs", "cloop", "dmg",
                                 "file", "file", "ftp", "ftps", "host_cdrom",

-                                "host_device", "host_floppy", "http", "https",
+                                "host_device", "http", "https",

                                 "nbd", "parallels", "qcow", "qcow2", "raw",
                                 "tftp", "vdi", "vmdk", "vpc", "vvfat"
          - "backing_file": backing file name (json-string, optional)
                                 "nbd", "parallels", "qcow", "qcow2", "raw",
                                 "tftp", "vdi", "vmdk", "vpc", "vvfat"
          - "backing_file": backing file name (json-string, optional)


@@ -2261,7 +2433,7 @@ Example:
                   "virtual-size":2048000,
                   "backing_file":"base.qcow2",
                   "full-backing-filename":"disks/base.qcow2",
                   "virtual-size":2048000,
                   "backing_file":"base.qcow2",
                   "full-backing-filename":"disks/base.qcow2",

-                  "backing-filename-format:"qcow2",
+                  "backing-filename-format":"qcow2",

                   "snapshots":[
                      {
                         "id": "1",
                   "snapshots":[
                      {
                         "id": "1",


@@ -2309,7 +2481,7 @@ EQMP
     {
         .name       = "query-block",
         .args_type  = "",
     {
         .name       = "query-block",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_block,
+        .mhandler.cmd_new = qmp_marshal_query_block,

     },
 
 SQMP
     },
 
 SQMP


@@ -2436,7 +2608,7 @@ EQMP
     {
         .name       = "query-blockstats",
         .args_type  = "query-nodes:b?",
     {
         .name       = "query-blockstats",
         .args_type  = "query-nodes:b?",

-        .mhandler.cmd_new = qmp_marshal_input_query_blockstats,
+        .mhandler.cmd_new = qmp_marshal_query_blockstats,

     },
 
 SQMP
     },
 
 SQMP


@@ -2450,6 +2622,7 @@ Return a json-array. Each CPU is represented by a json-object, which contains:
 - "CPU": CPU index (json-int)
 - "current": true if this is the current CPU, false otherwise (json-bool)
 - "halted": true if the cpu is halted, false otherwise (json-bool)
 - "CPU": CPU index (json-int)
 - "current": true if this is the current CPU, false otherwise (json-bool)
 - "halted": true if the cpu is halted, false otherwise (json-bool)

+- "qom_path": path to the CPU object in the QOM tree (json-str)

 - Current program counter. The key's name depends on the architecture:
      "pc": i386/x86_64 (json-int)
      "nip": PPC (json-int)
 - Current program counter. The key's name depends on the architecture:
      "pc": i386/x86_64 (json-int)
      "nip": PPC (json-int)


@@ -2466,14 +2639,16 @@ Example:
             "CPU":0,
             "current":true,
             "halted":false,
             "CPU":0,
             "current":true,
             "halted":false,

-            "pc":3227107138
+            "qom_path":"/machine/unattached/device[0]",
+            "pc":3227107138,

             "thread_id":3134
          },
          {
             "CPU":1,
             "current":false,
             "halted":true,
             "thread_id":3134
          },
          {
             "CPU":1,
             "current":false,
             "halted":true,

-            "pc":7108165
+            "qom_path":"/machine/unattached/device[2]",
+            "pc":7108165,

             "thread_id":3135
          }
       ]
             "thread_id":3135
          }
       ]


@@ -2484,7 +2659,7 @@ EQMP
     {
         .name       = "query-cpus",
         .args_type  = "",
     {
         .name       = "query-cpus",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_cpus,
+        .mhandler.cmd_new = qmp_marshal_query_cpus,

     },
 
 SQMP
     },
 
 SQMP


@@ -2523,7 +2698,7 @@ EQMP
     {
         .name       = "query-iothreads",
         .args_type  = "",
     {
         .name       = "query-iothreads",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_iothreads,
+        .mhandler.cmd_new = qmp_marshal_query_iothreads,

     },
 
 SQMP
     },
 
 SQMP


@@ -2740,7 +2915,7 @@ EQMP
     {
         .name       = "query-pci",
         .args_type  = "",
     {
         .name       = "query-pci",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_pci,
+        .mhandler.cmd_new = qmp_marshal_query_pci,

     },
 
 SQMP
     },
 
 SQMP


@@ -2764,7 +2939,7 @@ EQMP
     {
         .name       = "query-kvm",
         .args_type  = "",
     {
         .name       = "query-kvm",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_kvm,
+        .mhandler.cmd_new = qmp_marshal_query_kvm,

     },
 
 SQMP
     },
 
 SQMP


@@ -2804,7 +2979,7 @@ EQMP
     {
         .name       = "query-status",
         .args_type  = "",
     {
         .name       = "query-status",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_status,
+        .mhandler.cmd_new = qmp_marshal_query_status,

     },
 
 SQMP
     },
 
 SQMP


@@ -2848,7 +3023,7 @@ EQMP
     {
         .name       = "query-mice",
         .args_type  = "",
     {
         .name       = "query-mice",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_mice,
+        .mhandler.cmd_new = qmp_marshal_query_mice,

     },
 
 SQMP
     },
 
 SQMP


@@ -2911,12 +3086,12 @@ EQMP
     {
         .name       = "query-vnc",
         .args_type  = "",
     {
         .name       = "query-vnc",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_vnc,
+        .mhandler.cmd_new = qmp_marshal_query_vnc,

     },
     {
         .name       = "query-vnc-servers",
         .args_type  = "",
     },
     {
         .name       = "query-vnc-servers",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_vnc_servers,
+        .mhandler.cmd_new = qmp_marshal_query_vnc_servers,

     },
 
 SQMP
     },
 
 SQMP


@@ -2993,7 +3168,7 @@ EQMP
     {
         .name       = "query-spice",
         .args_type  = "",
     {
         .name       = "query-spice",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_spice,
+        .mhandler.cmd_new = qmp_marshal_query_spice,

     },
 #endif
 
     },
 #endif
 


@@ -3017,7 +3192,7 @@ EQMP
     {
         .name       = "query-name",
         .args_type  = "",
     {
         .name       = "query-name",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_name,
+        .mhandler.cmd_new = qmp_marshal_query_name,

     },
 
 SQMP
     },
 
 SQMP


@@ -3040,7 +3215,7 @@ EQMP
     {
         .name       = "query-uuid",
         .args_type  = "",
     {
         .name       = "query-uuid",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_uuid,
+        .mhandler.cmd_new = qmp_marshal_query_uuid,

     },
 
 SQMP
     },
 
 SQMP


@@ -3089,7 +3264,7 @@ EQMP
     {
         .name       = "query-command-line-options",
         .args_type  = "option:s?",
     {
         .name       = "query-command-line-options",
         .args_type  = "option:s?",

-        .mhandler.cmd_new = qmp_marshal_input_query_command_line_options,
+        .mhandler.cmd_new = qmp_marshal_query_command_line_options,

     },
 
 SQMP
     },
 
 SQMP


@@ -3267,7 +3442,7 @@ EQMP
     {
         .name       = "query-migrate",
         .args_type  = "",
     {
         .name       = "query-migrate",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_migrate,
+        .mhandler.cmd_new = qmp_marshal_query_migrate,

     },
 
 SQMP
     },
 
 SQMP


@@ -3280,6 +3455,7 @@ Enable/Disable migration capabilities
 - "rdma-pin-all": pin all pages when using RDMA during migration
 - "auto-converge": throttle down guest to help convergence of migration
 - "zero-blocks": compress zero blocks during block migration
 - "rdma-pin-all": pin all pages when using RDMA during migration
 - "auto-converge": throttle down guest to help convergence of migration
 - "zero-blocks": compress zero blocks during block migration

+- "events": generate events for each migration state change

 
 Arguments:
 
 
 Arguments:
 


@@ -3292,9 +3468,9 @@ EQMP
 
     {
         .name       = "migrate-set-capabilities",
 
     {
         .name       = "migrate-set-capabilities",

-        .args_type  = "capabilities:O",
+        .args_type  = "capabilities:q",

         .params     = "capability:s,state:b",
         .params     = "capability:s,state:b",

-       .mhandler.cmd_new = qmp_marshal_input_migrate_set_capabilities,
+        .mhandler.cmd_new = qmp_marshal_migrate_set_capabilities,

     },
 SQMP
 query-migrate-capabilities
     },
 SQMP
 query-migrate-capabilities


@@ -3320,7 +3496,64 @@ EQMP
     {
         .name       = "query-migrate-capabilities",
         .args_type  = "",
     {
         .name       = "query-migrate-capabilities",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_migrate_capabilities,
+        .mhandler.cmd_new = qmp_marshal_query_migrate_capabilities,
+    },
+
+SQMP
+migrate-set-parameters
+----------------------
+
+Set migration parameters
+
+- "compress-level": set compression level during migration (json-int)
+- "compress-threads": set compression thread count for migration (json-int)
+- "decompress-threads": set decompression thread count for migration (json-int)
+
+Arguments:
+
+Example:
+
+-> { "execute": "migrate-set-parameters" , "arguments":
+      { "compress-level": 1 } }
+
+EQMP
+
+    {
+        .name       = "migrate-set-parameters",
+        .args_type  =
+            "compress-level:i?,compress-threads:i?,decompress-threads:i?",
+        .mhandler.cmd_new = qmp_marshal_migrate_set_parameters,
+    },
+SQMP
+query-migrate-parameters
+------------------------
+
+Query current migration parameters
+
+- "parameters": migration parameters value
+         - "compress-level" : compression level value (json-int)
+         - "compress-threads" : compression thread count value (json-int)
+         - "decompress-threads" : decompression thread count value (json-int)
+
+Arguments:
+
+Example:
+
+-> { "execute": "query-migrate-parameters" }
+<- {
+      "return": {
+         "decompress-threads", 2,
+         "compress-threads", 8,
+         "compress-level", 1
+      }
+   }
+
+EQMP
+
+    {
+        .name       = "query-migrate-parameters",
+        .args_type  = "",
+        .mhandler.cmd_new = qmp_marshal_query_migrate_parameters,

     },
 
 SQMP
     },
 
 SQMP


@@ -3348,88 +3581,88 @@ EQMP
     {
         .name       = "query-balloon",
         .args_type  = "",
     {
         .name       = "query-balloon",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_balloon,
+        .mhandler.cmd_new = qmp_marshal_query_balloon,

     },
 
     {
         .name       = "query-block-jobs",
         .args_type  = "",
     },
 
     {
         .name       = "query-block-jobs",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_block_jobs,
+        .mhandler.cmd_new = qmp_marshal_query_block_jobs,

     },
 
     {
         .name       = "qom-list",
         .args_type  = "path:s",
     },
 
     {
         .name       = "qom-list",
         .args_type  = "path:s",

-        .mhandler.cmd_new = qmp_marshal_input_qom_list,
+        .mhandler.cmd_new = qmp_marshal_qom_list,

     },
 
     {
         .name       = "qom-set",
        .args_type  = "path:s,property:s,value:q",
     },
 
     {
         .name       = "qom-set",
        .args_type  = "path:s,property:s,value:q",

-       .mhandler.cmd_new = qmp_qom_set,
+        .mhandler.cmd_new = qmp_marshal_qom_set,

     },
 
     {
         .name       = "qom-get",
        .args_type  = "path:s,property:s",
     },
 
     {
         .name       = "qom-get",
        .args_type  = "path:s,property:s",

-       .mhandler.cmd_new = qmp_qom_get,
+        .mhandler.cmd_new = qmp_marshal_qom_get,

     },
 
     {
         .name       = "nbd-server-start",
         .args_type  = "addr:q",
     },
 
     {
         .name       = "nbd-server-start",
         .args_type  = "addr:q",

-        .mhandler.cmd_new = qmp_marshal_input_nbd_server_start,
+        .mhandler.cmd_new = qmp_marshal_nbd_server_start,

     },
     {
         .name       = "nbd-server-add",
         .args_type  = "device:B,writable:b?",
     },
     {
         .name       = "nbd-server-add",
         .args_type  = "device:B,writable:b?",

-        .mhandler.cmd_new = qmp_marshal_input_nbd_server_add,
+        .mhandler.cmd_new = qmp_marshal_nbd_server_add,

     },
     {
         .name       = "nbd-server-stop",
         .args_type  = "",
     },
     {
         .name       = "nbd-server-stop",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_nbd_server_stop,
+        .mhandler.cmd_new = qmp_marshal_nbd_server_stop,

     },
 
     {
         .name       = "change-vnc-password",
         .args_type  = "password:s",
     },
 
     {
         .name       = "change-vnc-password",
         .args_type  = "password:s",

-        .mhandler.cmd_new = qmp_marshal_input_change_vnc_password,
+        .mhandler.cmd_new = qmp_marshal_change_vnc_password,

     },
     {
         .name       = "qom-list-types",
         .args_type  = "implements:s?,abstract:b?",
     },
     {
         .name       = "qom-list-types",
         .args_type  = "implements:s?,abstract:b?",

-        .mhandler.cmd_new = qmp_marshal_input_qom_list_types,
+        .mhandler.cmd_new = qmp_marshal_qom_list_types,

     },
 
     {
         .name       = "device-list-properties",
         .args_type  = "typename:s",
     },
 
     {
         .name       = "device-list-properties",
         .args_type  = "typename:s",

-        .mhandler.cmd_new = qmp_marshal_input_device_list_properties,
+        .mhandler.cmd_new = qmp_marshal_device_list_properties,

     },
 
     {
         .name       = "query-machines",
         .args_type  = "",
     },
 
     {
         .name       = "query-machines",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_machines,
+        .mhandler.cmd_new = qmp_marshal_query_machines,

     },
 
     {
         .name       = "query-cpu-definitions",
         .args_type  = "",
     },
 
     {
         .name       = "query-cpu-definitions",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_cpu_definitions,
+        .mhandler.cmd_new = qmp_marshal_query_cpu_definitions,

     },
 
     {
         .name       = "query-target",
         .args_type  = "",
     },
 
     {
         .name       = "query-target",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_target,
+        .mhandler.cmd_new = qmp_marshal_query_target,

     },
 
     {
         .name       = "query-tpm",
         .args_type  = "",
     },
 
     {
         .name       = "query-tpm",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_tpm,
+        .mhandler.cmd_new = qmp_marshal_query_tpm,

     },
 
 SQMP
     },
 
 SQMP


@@ -3463,7 +3696,7 @@ EQMP
     {
         .name       = "query-tpm-models",
         .args_type  = "",
     {
         .name       = "query-tpm-models",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_tpm_models,
+        .mhandler.cmd_new = qmp_marshal_query_tpm_models,

     },
 
 SQMP
     },
 
 SQMP


@@ -3484,7 +3717,7 @@ EQMP
     {
         .name       = "query-tpm-types",
         .args_type  = "",
     {
         .name       = "query-tpm-types",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_tpm_types,
+        .mhandler.cmd_new = qmp_marshal_query_tpm_types,

     },
 
 SQMP
     },
 
 SQMP


@@ -3505,7 +3738,7 @@ EQMP
     {
         .name       = "chardev-add",
         .args_type  = "id:s,backend:q",
     {
         .name       = "chardev-add",
         .args_type  = "id:s,backend:q",

-        .mhandler.cmd_new = qmp_marshal_input_chardev_add,
+        .mhandler.cmd_new = qmp_marshal_chardev_add,

     },
 
 SQMP
     },
 
 SQMP


@@ -3542,7 +3775,7 @@ EQMP
     {
         .name       = "chardev-remove",
         .args_type  = "id:s",
     {
         .name       = "chardev-remove",
         .args_type  = "id:s",

-        .mhandler.cmd_new = qmp_marshal_input_chardev_remove,
+        .mhandler.cmd_new = qmp_marshal_chardev_remove,

     },
 
 
     },
 
 


@@ -3565,7 +3798,7 @@ EQMP
     {
         .name       = "query-rx-filter",
         .args_type  = "name:s?",
     {
         .name       = "query-rx-filter",
         .args_type  = "name:s?",

-        .mhandler.cmd_new = qmp_marshal_input_query_rx_filter,
+        .mhandler.cmd_new = qmp_marshal_query_rx_filter,

     },
 
 SQMP
     },
 
 SQMP


@@ -3631,7 +3864,7 @@ EQMP
     {
         .name       = "blockdev-add",
         .args_type  = "options:q",
     {
         .name       = "blockdev-add",
         .args_type  = "options:q",

-        .mhandler.cmd_new = qmp_marshal_input_blockdev_add,
+        .mhandler.cmd_new = qmp_marshal_blockdev_add,

     },
 
 SQMP
     },
 
 SQMP


@@ -3640,6 +3873,10 @@ blockdev-add
 
 Add a block device.
 
 
 Add a block device.
 

+This command is still a work in progress.  It doesn't support all
+block drivers, it lacks a matching blockdev-del, and more.  Stay away
+from it unless you want to help with its development.
+

 Arguments:
 
 - "options": block driver options
 Arguments:
 
 - "options": block driver options


@@ -3686,7 +3923,7 @@ EQMP
     {
         .name       = "query-named-block-nodes",
         .args_type  = "",
     {
         .name       = "query-named-block-nodes",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_named_block_nodes,
+        .mhandler.cmd_new = qmp_marshal_query_named_block_nodes,

     },
 
 SQMP
     },
 
 SQMP


@@ -3724,7 +3961,7 @@ Example:
                       "virtual-size":2048000,
                       "backing_file":"base.qcow2",
                       "full-backing-filename":"disks/base.qcow2",
                       "virtual-size":2048000,
                       "backing_file":"base.qcow2",
                       "full-backing-filename":"disks/base.qcow2",

-                      "backing-filename-format:"qcow2",
+                      "backing-filename-format":"qcow2",

                       "snapshots":[
                          {
                             "id": "1",
                       "snapshots":[
                          {
                             "id": "1",


@@ -3748,7 +3985,7 @@ EQMP
     {
         .name       = "query-memdev",
         .args_type  = "",
     {
         .name       = "query-memdev",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_memdev,
+        .mhandler.cmd_new = qmp_marshal_query_memdev,

     },
 
 SQMP
     },
 
 SQMP


@@ -3786,7 +4023,7 @@ EQMP
     {
         .name       = "query-memory-devices",
         .args_type  = "",
     {
         .name       = "query-memory-devices",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_memory_devices,
+        .mhandler.cmd_new = qmp_marshal_query_memory_devices,

     },
 
 SQMP
     },
 
 SQMP


@@ -3813,7 +4050,7 @@ EQMP
     {
         .name       = "query-acpi-ospm-status",
         .args_type  = "",
     {
         .name       = "query-acpi-ospm-status",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_query_acpi_ospm_status,
+        .mhandler.cmd_new = qmp_marshal_query_acpi_ospm_status,

     },
 
 SQMP
     },
 
 SQMP


@@ -3836,7 +4073,7 @@ EQMP
     {
         .name       = "rtc-reset-reinjection",
         .args_type  = "",
     {
         .name       = "rtc-reset-reinjection",
         .args_type  = "",

-        .mhandler.cmd_new = qmp_marshal_input_rtc_reset_reinjection,
+        .mhandler.cmd_new = qmp_marshal_rtc_reset_reinjection,

     },
 #endif
 
     },
 #endif
 


@@ -3857,7 +4094,7 @@ EQMP
     {
         .name       = "trace-event-get-state",
         .args_type  = "name:s",
     {
         .name       = "trace-event-get-state",
         .args_type  = "name:s",

-        .mhandler.cmd_new = qmp_marshal_input_trace_event_get_state,
+        .mhandler.cmd_new = qmp_marshal_trace_event_get_state,

     },
 
 SQMP
     },
 
 SQMP


@@ -3875,7 +4112,7 @@ EQMP
     {
         .name       = "trace-event-set-state",
         .args_type  = "name:s,enable:b,ignore-unavailable:b?",
     {
         .name       = "trace-event-set-state",
         .args_type  = "name:s,enable:b,ignore-unavailable:b?",

-        .mhandler.cmd_new = qmp_marshal_input_trace_event_set_state,
+        .mhandler.cmd_new = qmp_marshal_trace_event_set_state,

     },
 
 SQMP
     },
 
 SQMP


@@ -3893,7 +4130,7 @@ EQMP
     {
         .name       = "x-input-send-event",
         .args_type  = "console:i?,events:q",
     {
         .name       = "x-input-send-event",
         .args_type  = "console:i?,events:q",

-        .mhandler.cmd_new = qmp_marshal_input_x_input_send_event,
+        .mhandler.cmd_new = qmp_marshal_x_input_send_event,

     },
 
 SQMP
     },
 
 SQMP


@@ -3958,7 +4195,7 @@ EQMP
     {
         .name       = "block-set-write-threshold",
         .args_type  = "node-name:s,write-threshold:l",
     {
         .name       = "block-set-write-threshold",
         .args_type  = "node-name:s,write-threshold:l",

-        .mhandler.cmd_new = qmp_marshal_input_block_set_write_threshold,
+        .mhandler.cmd_new = qmp_marshal_block_set_write_threshold,

     },
 
 SQMP
     },
 
 SQMP


@@ -3982,3 +4219,106 @@ Example:
 <- { "return": {} }
 
 EQMP
 <- { "return": {} }
 
 EQMP

+
+    {
+        .name       = "query-rocker",
+        .args_type  = "name:s",
+        .mhandler.cmd_new = qmp_marshal_query_rocker,
+    },
+
+SQMP
+Show rocker switch
+------------------
+
+Arguments:
+
+- "name": switch name
+
+Example:
+
+-> { "execute": "query-rocker", "arguments": { "name": "sw1" } }
+<- { "return": {"name": "sw1", "ports": 2, "id": 1327446905938}}
+
+EQMP
+
+    {
+        .name       = "query-rocker-ports",
+        .args_type  = "name:s",
+        .mhandler.cmd_new = qmp_marshal_query_rocker_ports,
+    },
+
+SQMP
+Show rocker switch ports
+------------------------
+
+Arguments:
+
+- "name": switch name
+
+Example:
+
+-> { "execute": "query-rocker-ports", "arguments": { "name": "sw1" } }
+<- { "return": [ {"duplex": "full", "enabled": true, "name": "sw1.1",
+                  "autoneg": "off", "link-up": true, "speed": 10000},
+                 {"duplex": "full", "enabled": true, "name": "sw1.2",
+                  "autoneg": "off", "link-up": true, "speed": 10000}
+   ]}
+
+EQMP
+
+    {
+        .name       = "query-rocker-of-dpa-flows",
+        .args_type  = "name:s,tbl-id:i?",
+        .mhandler.cmd_new = qmp_marshal_query_rocker_of_dpa_flows,
+    },
+
+SQMP
+Show rocker switch OF-DPA flow tables
+-------------------------------------
+
+Arguments:
+
+- "name": switch name
+- "tbl-id": (optional) flow table ID
+
+Example:
+
+-> { "execute": "query-rocker-of-dpa-flows", "arguments": { "name": "sw1" } }
+<- { "return": [ {"key": {"in-pport": 0, "priority": 1, "tbl-id": 0},
+                  "hits": 138,
+                  "cookie": 0,
+                  "action": {"goto-tbl": 10},
+                  "mask": {"in-pport": 4294901760}
+                 },
+                 {...more...},
+   ]}
+
+EQMP
+
+    {
+        .name       = "query-rocker-of-dpa-groups",
+        .args_type  = "name:s,type:i?",
+        .mhandler.cmd_new = qmp_marshal_query_rocker_of_dpa_groups,
+    },
+
+SQMP
+Show rocker OF-DPA group tables
+-------------------------------
+
+Arguments:
+
+- "name": switch name
+- "type": (optional) group type
+
+Example:
+
+-> { "execute": "query-rocker-of-dpa-groups", "arguments": { "name": "sw1" } }
+<- { "return": [ {"type": 0, "out-pport": 2, "pport": 2, "vlan-id": 3841,
+                  "pop-vlan": 1, "id": 251723778},
+                 {"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3841,
+                  "pop-vlan": 1, "id": 251723776},
+                 {"type": 0, "out-pport": 1, "pport": 1, "vlan-id": 3840,
+                  "pop-vlan": 1, "id": 251658241},
+                 {"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840,
+                  "pop-vlan": 1, "id": 251658240}
+   ]}