linux-user: Add missing Mips syscalls items in strace.list

[qemu.git] / hmp-commands.hx

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3d7dfccf7c3c6ade36526ca0f9968ea5fe7eb81d..06bef470b99e3b856b3dc12d5b7b0b0b00f86c1d 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -14,7 +14,7 @@ ETEXI
         .args_type  = "name:S?",
         .params     = "[cmd]",
         .help       = "show the help",
         .args_type  = "name:S?",
         .params     = "[cmd]",
         .help       = "show the help",

-        .mhandler.cmd = do_help_cmd,
+        .cmd        = do_help_cmd,

     },
 
 STEXI
     },
 
 STEXI


@@ -28,7 +28,7 @@ ETEXI
         .args_type  = "device:B",
         .params     = "device|all",
         .help       = "commit changes to the disk images (if -snapshot is used) or backing files",
         .args_type  = "device:B",
         .params     = "device|all",
         .help       = "commit changes to the disk images (if -snapshot is used) or backing files",

-        .mhandler.cmd = hmp_commit,
+        .cmd        = hmp_commit,

     },
 
 STEXI
     },
 
 STEXI


@@ -47,7 +47,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "quit the emulator",
         .args_type  = "",
         .params     = "",
         .help       = "quit the emulator",

-        .mhandler.cmd = hmp_quit,
+        .cmd        = hmp_quit,

     },
 
 STEXI
     },
 
 STEXI


@@ -61,7 +61,7 @@ ETEXI
         .args_type  = "device:B,size:o",
         .params     = "device size",
         .help       = "resize a block image",
         .args_type  = "device:B,size:o",
         .params     = "device size",
         .help       = "resize a block image",

-        .mhandler.cmd = hmp_block_resize,
+        .cmd        = hmp_block_resize,

     },
 
 STEXI
     },
 
 STEXI


@@ -78,7 +78,7 @@ ETEXI
         .args_type  = "device:B,speed:o?,base:s?",
         .params     = "device [speed [base]]",
         .help       = "copy data from a backing file into a block device",
         .args_type  = "device:B,speed:o?,base:s?",
         .params     = "device [speed [base]]",
         .help       = "copy data from a backing file into a block device",

-        .mhandler.cmd = hmp_block_stream,
+        .cmd        = hmp_block_stream,

     },
 
 STEXI
     },
 
 STEXI


@@ -92,7 +92,7 @@ ETEXI
         .args_type  = "device:B,speed:o",
         .params     = "device speed",
         .help       = "set maximum speed for a background block operation",
         .args_type  = "device:B,speed:o",
         .params     = "device speed",
         .help       = "set maximum speed for a background block operation",

-        .mhandler.cmd = hmp_block_job_set_speed,
+        .cmd        = hmp_block_job_set_speed,

     },
 
 STEXI
     },
 
 STEXI


@@ -107,7 +107,7 @@ ETEXI
         .params     = "[-f] device",
         .help       = "stop an active background block operation (use -f"
                       "\n\t\t\t if the operation is currently paused)",
         .params     = "[-f] device",
         .help       = "stop an active background block operation (use -f"
                       "\n\t\t\t if the operation is currently paused)",

-        .mhandler.cmd = hmp_block_job_cancel,
+        .cmd        = hmp_block_job_cancel,

     },
 
 STEXI
     },
 
 STEXI


@@ -121,7 +121,7 @@ ETEXI
         .args_type  = "device:B",
         .params     = "device",
         .help       = "stop an active background block operation",
         .args_type  = "device:B",
         .params     = "device",
         .help       = "stop an active background block operation",

-        .mhandler.cmd = hmp_block_job_complete,
+        .cmd        = hmp_block_job_complete,

     },
 
 STEXI
     },
 
 STEXI


@@ -136,7 +136,7 @@ ETEXI
         .args_type  = "device:B",
         .params     = "device",
         .help       = "pause an active background block operation",
         .args_type  = "device:B",
         .params     = "device",
         .help       = "pause an active background block operation",

-        .mhandler.cmd = hmp_block_job_pause,
+        .cmd        = hmp_block_job_pause,

     },
 
 STEXI
     },
 
 STEXI


@@ -150,7 +150,7 @@ ETEXI
         .args_type  = "device:B",
         .params     = "device",
         .help       = "resume a paused background block operation",
         .args_type  = "device:B",
         .params     = "device",
         .help       = "resume a paused background block operation",

-        .mhandler.cmd = hmp_block_job_resume,
+        .cmd        = hmp_block_job_resume,

     },
 
 STEXI
     },
 
 STEXI


@@ -164,7 +164,7 @@ ETEXI
         .args_type  = "force:-f,device:B",
         .params     = "[-f] device",
         .help       = "eject a removable medium (use -f to force it)",
         .args_type  = "force:-f,device:B",
         .params     = "[-f] device",
         .help       = "eject a removable medium (use -f to force it)",

-        .mhandler.cmd = hmp_eject,
+        .cmd        = hmp_eject,

     },
 
 STEXI
     },
 
 STEXI


@@ -178,7 +178,7 @@ ETEXI
         .args_type  = "id:B",
         .params     = "device",
         .help       = "remove host block device",
         .args_type  = "id:B",
         .params     = "device",
         .help       = "remove host block device",

-        .mhandler.cmd = hmp_drive_del,
+        .cmd        = hmp_drive_del,

     },
 
 STEXI
     },
 
 STEXI


@@ -194,10 +194,10 @@ ETEXI
 
     {
         .name       = "change",
 
     {
         .name       = "change",

-        .args_type  = "device:B,target:F,arg:s?",
-        .params     = "device filename [format]",
+        .args_type  = "device:B,target:F,arg:s?,read-only-mode:s?",
+        .params     = "device filename [format [read-only-mode]]",

         .help       = "change a removable medium, optional format",
         .help       = "change a removable medium, optional format",

-        .mhandler.cmd = hmp_change,
+        .cmd        = hmp_change,

     },
 
 STEXI
     },
 
 STEXI


@@ -206,7 +206,7 @@ STEXI
 Change the configuration of a device.
 
 @table @option
 Change the configuration of a device.
 
 @table @option

-@item change @var{diskdevice} @var{filename} [@var{format}]
+@item change @var{diskdevice} @var{filename} [@var{format} [@var{read-only-mode}]]

 Change the medium for a removable disk device to point to @var{filename}. eg
 
 @example
 Change the medium for a removable disk device to point to @var{filename}. eg
 
 @example


@@ -215,6 +215,20 @@ Change the medium for a removable disk device to point to @var{filename}. eg
 
 @var{format} is optional.
 
 
 @var{format} is optional.
 

+@var{read-only-mode} may be used to change the read-only status of the device.
+It accepts the following values:
+
+@table @var
+@item retain
+Retains the current status; this is the default.
+
+@item read-only
+Makes the device read-only.
+
+@item read-write
+Makes the device writable.
+@end table
+

 @item change vnc @var{display},@var{options}
 Change the configuration of the VNC server. The valid syntax for @var{display}
 and @var{options} are described at @ref{sec_invocation}. eg
 @item change vnc @var{display},@var{options}
 Change the configuration of the VNC server. The valid syntax for @var{display}
 and @var{options} are described at @ref{sec_invocation}. eg


@@ -242,7 +256,7 @@ ETEXI
         .args_type  = "filename:F",
         .params     = "filename",
         .help       = "save screen into PPM image 'filename'",
         .args_type  = "filename:F",
         .params     = "filename",
         .help       = "save screen into PPM image 'filename'",

-        .mhandler.cmd = hmp_screendump,
+        .cmd        = hmp_screendump,

     },
 
 STEXI
     },
 
 STEXI


@@ -256,7 +270,7 @@ ETEXI
         .args_type  = "filename:F",
         .params     = "filename",
         .help       = "output logs to 'filename'",
         .args_type  = "filename:F",
         .params     = "filename",
         .help       = "output logs to 'filename'",

-        .mhandler.cmd = hmp_logfile,
+        .cmd        = hmp_logfile,

     },
 
 STEXI
     },
 
 STEXI


@@ -267,10 +281,12 @@ ETEXI
 
     {
         .name       = "trace-event",
 
     {
         .name       = "trace-event",

-        .args_type  = "name:s,option:b",
-        .params     = "name on|off",
-        .help       = "changes status of a specific trace event",
-        .mhandler.cmd = hmp_trace_event,
+        .args_type  = "name:s,option:b,vcpu:i?",
+        .params     = "name on|off [vcpu]",
+        .help       = "changes status of a specific trace event "
+                      "(vcpu: vCPU to set, default is all)",
+        .cmd = hmp_trace_event,
+        .command_completion = trace_event_completion,

     },
 
 STEXI
     },
 
 STEXI


@@ -285,7 +301,7 @@ ETEXI
         .args_type  = "op:s?,arg:F?",
         .params     = "on|off|flush|set [arg]",
         .help       = "open, close, or flush trace file, or set a new file name",
         .args_type  = "op:s?,arg:F?",
         .params     = "on|off|flush|set [arg]",
         .help       = "open, close, or flush trace file, or set a new file name",

-        .mhandler.cmd = hmp_trace_file,
+        .cmd        = hmp_trace_file,

     },
 
 STEXI
     },
 
 STEXI


@@ -300,7 +316,7 @@ ETEXI
         .args_type  = "items:s",
         .params     = "item1[,...]",
         .help       = "activate logging of the specified items",
         .args_type  = "items:s",
         .params     = "item1[,...]",
         .help       = "activate logging of the specified items",

-        .mhandler.cmd = hmp_log,
+        .cmd        = hmp_log,

     },
 
 STEXI
     },
 
 STEXI


@@ -314,7 +330,7 @@ ETEXI
         .args_type  = "name:s?",
         .params     = "[tag|id]",
         .help       = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
         .args_type  = "name:s?",
         .params     = "[tag|id]",
         .help       = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",

-        .mhandler.cmd = hmp_savevm,
+        .cmd        = hmp_savevm,

     },
 
 STEXI
     },
 
 STEXI


@@ -331,7 +347,7 @@ ETEXI
         .args_type  = "name:s",
         .params     = "tag|id",
         .help       = "restore a VM snapshot from its tag or id",
         .args_type  = "name:s",
         .params     = "tag|id",
         .help       = "restore a VM snapshot from its tag or id",

-        .mhandler.cmd = hmp_loadvm,
+        .cmd        = hmp_loadvm,

         .command_completion = loadvm_completion,
     },
 
         .command_completion = loadvm_completion,
     },
 


@@ -347,7 +363,7 @@ ETEXI
         .args_type  = "name:s",
         .params     = "tag|id",
         .help       = "delete a VM snapshot from its tag or id",
         .args_type  = "name:s",
         .params     = "tag|id",
         .help       = "delete a VM snapshot from its tag or id",

-        .mhandler.cmd = hmp_delvm,
+        .cmd        = hmp_delvm,

         .command_completion = delvm_completion,
     },
 
         .command_completion = delvm_completion,
     },
 


@@ -362,7 +378,7 @@ ETEXI
         .args_type  = "option:s?",
         .params     = "[on|off]",
         .help       = "run emulation in singlestep mode or switch to normal mode",
         .args_type  = "option:s?",
         .params     = "[on|off]",
         .help       = "run emulation in singlestep mode or switch to normal mode",

-        .mhandler.cmd = hmp_singlestep,
+        .cmd        = hmp_singlestep,

     },
 
 STEXI
     },
 
 STEXI


@@ -377,7 +393,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "stop emulation",
         .args_type  = "",
         .params     = "",
         .help       = "stop emulation",

-        .mhandler.cmd = hmp_stop,
+        .cmd        = hmp_stop,

     },
 
 STEXI
     },
 
 STEXI


@@ -391,7 +407,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "resume emulation",
         .args_type  = "",
         .params     = "",
         .help       = "resume emulation",

-        .mhandler.cmd = hmp_cont,
+        .cmd        = hmp_cont,

     },
 
 STEXI
     },
 
 STEXI


@@ -405,7 +421,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "wakeup guest from suspend",
         .args_type  = "",
         .params     = "",
         .help       = "wakeup guest from suspend",

-        .mhandler.cmd = hmp_system_wakeup,
+        .cmd        = hmp_system_wakeup,

     },
 
 STEXI
     },
 
 STEXI


@@ -419,7 +435,7 @@ ETEXI
         .args_type  = "device:s?",
         .params     = "[device]",
         .help       = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",
         .args_type  = "device:s?",
         .params     = "[device]",
         .help       = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",

-        .mhandler.cmd = hmp_gdbserver,
+        .cmd        = hmp_gdbserver,

     },
 
 STEXI
     },
 
 STEXI


@@ -433,7 +449,7 @@ ETEXI
         .args_type  = "fmt:/,addr:l",
         .params     = "/fmt addr",
         .help       = "virtual memory dump starting at 'addr'",
         .args_type  = "fmt:/,addr:l",
         .params     = "/fmt addr",
         .help       = "virtual memory dump starting at 'addr'",

-        .mhandler.cmd = hmp_memory_dump,
+        .cmd        = hmp_memory_dump,

     },
 
 STEXI
     },
 
 STEXI


@@ -447,7 +463,7 @@ ETEXI
         .args_type  = "fmt:/,addr:l",
         .params     = "/fmt addr",
         .help       = "physical memory dump starting at 'addr'",
         .args_type  = "fmt:/,addr:l",
         .params     = "/fmt addr",
         .help       = "physical memory dump starting at 'addr'",

-        .mhandler.cmd = hmp_physical_memory_dump,
+        .cmd        = hmp_physical_memory_dump,

     },
 
 STEXI
     },
 
 STEXI


@@ -514,7 +530,7 @@ ETEXI
         .args_type  = "fmt:/,val:l",
         .params     = "/fmt expr",
         .help       = "print expression value (use $reg for CPU register access)",
         .args_type  = "fmt:/,val:l",
         .params     = "/fmt expr",
         .help       = "print expression value (use $reg for CPU register access)",

-        .mhandler.cmd = do_print,
+        .cmd        = do_print,

     },
 
 STEXI
     },
 
 STEXI


@@ -529,7 +545,7 @@ ETEXI
         .args_type  = "fmt:/,addr:i,index:i.",
         .params     = "/fmt addr",
         .help       = "I/O port read",
         .args_type  = "fmt:/,addr:i,index:i.",
         .params     = "/fmt addr",
         .help       = "I/O port read",

-        .mhandler.cmd = hmp_ioport_read,
+        .cmd        = hmp_ioport_read,

     },
 
 STEXI
     },
 
 STEXI


@@ -543,7 +559,7 @@ ETEXI
         .args_type  = "fmt:/,addr:i,val:i",
         .params     = "/fmt addr value",
         .help       = "I/O port write",
         .args_type  = "fmt:/,addr:i,val:i",
         .params     = "/fmt addr value",
         .help       = "I/O port write",

-        .mhandler.cmd = hmp_ioport_write,
+        .cmd        = hmp_ioport_write,

     },
 
 STEXI
     },
 
 STEXI


@@ -557,7 +573,7 @@ ETEXI
         .args_type  = "keys:s,hold-time:i?",
         .params     = "keys [hold_ms]",
         .help       = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
         .args_type  = "keys:s,hold-time:i?",
         .params     = "keys [hold_ms]",
         .help       = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",

-        .mhandler.cmd = hmp_sendkey,
+        .cmd        = hmp_sendkey,

         .command_completion = sendkey_completion,
     },
 
         .command_completion = sendkey_completion,
     },
 


@@ -580,7 +596,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "reset the system",
         .args_type  = "",
         .params     = "",
         .help       = "reset the system",

-        .mhandler.cmd = hmp_system_reset,
+        .cmd        = hmp_system_reset,

     },
 
 STEXI
     },
 
 STEXI


@@ -594,7 +610,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "send system power down event",
         .args_type  = "",
         .params     = "",
         .help       = "send system power down event",

-        .mhandler.cmd = hmp_system_powerdown,
+        .cmd        = hmp_system_powerdown,

     },
 
 STEXI
     },
 
 STEXI


@@ -608,7 +624,7 @@ ETEXI
         .args_type  = "start:i,size:i",
         .params     = "addr size",
         .help       = "compute the checksum of a memory region",
         .args_type  = "start:i,size:i",
         .params     = "addr size",
         .help       = "compute the checksum of a memory region",

-        .mhandler.cmd = hmp_sum,
+        .cmd        = hmp_sum,

     },
 
 STEXI
     },
 
 STEXI


@@ -622,7 +638,7 @@ ETEXI
         .args_type  = "devname:s",
         .params     = "device",
         .help       = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
         .args_type  = "devname:s",
         .params     = "device",
         .help       = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",

-        .mhandler.cmd = hmp_usb_add,
+        .cmd        = hmp_usb_add,

     },
 
 STEXI
     },
 
 STEXI


@@ -637,7 +653,7 @@ ETEXI
         .args_type  = "devname:s",
         .params     = "device",
         .help       = "remove USB device 'bus.addr'",
         .args_type  = "devname:s",
         .params     = "device",
         .help       = "remove USB device 'bus.addr'",

-        .mhandler.cmd = hmp_usb_del,
+        .cmd        = hmp_usb_del,

     },
 
 STEXI
     },
 
 STEXI


@@ -653,7 +669,7 @@ ETEXI
         .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",

-        .mhandler.cmd = hmp_device_add,
+        .cmd        = hmp_device_add,

         .command_completion = device_add_completion,
     },
 
         .command_completion = device_add_completion,
     },
 


@@ -668,14 +684,15 @@ ETEXI
         .args_type  = "id:s",
         .params     = "device",
         .help       = "remove device",
         .args_type  = "id:s",
         .params     = "device",
         .help       = "remove device",

-        .mhandler.cmd = hmp_device_del,
+        .cmd        = hmp_device_del,

         .command_completion = device_del_completion,
     },
 
 STEXI
 @item device_del @var{id}
 @findex device_del
         .command_completion = device_del_completion,
     },
 
 STEXI
 @item device_del @var{id}
 @findex device_del

-Remove device @var{id}.
+Remove device @var{id}. @var{id} may be a short ID
+or a QOM object path.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -683,7 +700,7 @@ ETEXI
         .args_type  = "index:i",
         .params     = "index",
         .help       = "set the default CPU",
         .args_type  = "index:i",
         .params     = "index",
         .help       = "set the default CPU",

-        .mhandler.cmd = hmp_cpu,
+        .cmd        = hmp_cpu,

     },
 
 STEXI
     },
 
 STEXI


@@ -697,7 +714,7 @@ ETEXI
         .args_type  = "dx_str:s,dy_str:s,dz_str:s?",
         .params     = "dx dy [dz]",
         .help       = "send mouse move events",
         .args_type  = "dx_str:s,dy_str:s,dz_str:s?",
         .params     = "dx dy [dz]",
         .help       = "send mouse move events",

-        .mhandler.cmd = hmp_mouse_move,
+        .cmd        = hmp_mouse_move,

     },
 
 STEXI
     },
 
 STEXI


@@ -712,7 +729,7 @@ ETEXI
         .args_type  = "button_state:i",
         .params     = "state",
         .help       = "change mouse button state (1=L, 2=M, 4=R)",
         .args_type  = "button_state:i",
         .params     = "state",
         .help       = "change mouse button state (1=L, 2=M, 4=R)",

-        .mhandler.cmd = hmp_mouse_button,
+        .cmd        = hmp_mouse_button,

     },
 
 STEXI
     },
 
 STEXI


@@ -726,7 +743,7 @@ ETEXI
         .args_type  = "index:i",
         .params     = "index",
         .help       = "set which mouse device receives events",
         .args_type  = "index:i",
         .params     = "index",
         .help       = "set which mouse device receives events",

-        .mhandler.cmd = hmp_mouse_set,
+        .cmd        = hmp_mouse_set,

     },
 
 STEXI
     },
 
 STEXI


@@ -744,7 +761,7 @@ ETEXI
         .args_type  = "path:F,freq:i?,bits:i?,nchannels:i?",
         .params     = "path [frequency [bits [channels]]]",
         .help       = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
         .args_type  = "path:F,freq:i?,bits:i?,nchannels:i?",
         .params     = "path [frequency [bits [channels]]]",
         .help       = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",

-        .mhandler.cmd = hmp_wavcapture,
+        .cmd        = hmp_wavcapture,

     },
 STEXI
 @item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]
     },
 STEXI
 @item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]


@@ -765,7 +782,7 @@ ETEXI
         .args_type  = "n:i",
         .params     = "capture index",
         .help       = "stop capture",
         .args_type  = "n:i",
         .params     = "capture index",
         .help       = "stop capture",

-        .mhandler.cmd = hmp_stopcapture,
+        .cmd        = hmp_stopcapture,

     },
 STEXI
 @item stopcapture @var{index}
     },
 STEXI
 @item stopcapture @var{index}


@@ -781,7 +798,7 @@ ETEXI
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk virtual memory dump starting at 'addr' of size 'size'",
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk virtual memory dump starting at 'addr' of size 'size'",

-        .mhandler.cmd = hmp_memsave,
+        .cmd        = hmp_memsave,

     },
 
 STEXI
     },
 
 STEXI


@@ -795,7 +812,7 @@ ETEXI
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk physical memory dump starting at 'addr' of size 'size'",
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk physical memory dump starting at 'addr' of size 'size'",

-        .mhandler.cmd = hmp_pmemsave,
+        .cmd        = hmp_pmemsave,

     },
 
 STEXI
     },
 
 STEXI


@@ -809,7 +826,7 @@ ETEXI
         .args_type  = "bootdevice:s",
         .params     = "bootdevice",
         .help       = "define new values for the boot device list",
         .args_type  = "bootdevice:s",
         .params     = "bootdevice",
         .help       = "define new values for the boot device list",

-        .mhandler.cmd = hmp_boot_set,
+        .cmd        = hmp_boot_set,

     },
 
 STEXI
     },
 
 STEXI


@@ -827,7 +844,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "inject an NMI",
         .args_type  = "",
         .params     = "",
         .help       = "inject an NMI",

-        .mhandler.cmd = hmp_nmi,
+        .cmd        = hmp_nmi,

     },
 STEXI
 @item nmi @var{cpu}
     },
 STEXI
 @item nmi @var{cpu}


@@ -841,7 +858,7 @@ ETEXI
         .args_type  = "device:s,data:s",
         .params     = "device data",
         .help       = "Write to a ring buffer character device",
         .args_type  = "device:s,data:s",
         .params     = "device data",
         .help       = "Write to a ring buffer character device",

-        .mhandler.cmd = hmp_ringbuf_write,
+        .cmd        = hmp_ringbuf_write,

         .command_completion = ringbuf_write_completion,
     },
 
         .command_completion = ringbuf_write_completion,
     },
 


@@ -858,7 +875,7 @@ ETEXI
         .args_type  = "device:s,size:i",
         .params     = "device size",
         .help       = "Read from a ring buffer character device",
         .args_type  = "device:s,size:i",
         .params     = "device size",
         .help       = "Read from a ring buffer character device",

-        .mhandler.cmd = hmp_ringbuf_read,
+        .cmd        = hmp_ringbuf_read,

         .command_completion = ringbuf_write_completion,
     },
 
         .command_completion = ringbuf_write_completion,
     },
 


@@ -884,7 +901,7 @@ ETEXI
                      " full copy of disk\n\t\t\t -i for migration without "
                      "shared storage with incremental copy of disk "
                      "(base image shared between src and destination)",
                      " full copy of disk\n\t\t\t -i for migration without "
                      "shared storage with incremental copy of disk "
                      "(base image shared between src and destination)",

-        .mhandler.cmd = hmp_migrate,
+        .cmd        = hmp_migrate,

     },
 
 
     },
 
 


@@ -901,7 +918,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "cancel the current VM migration",
         .args_type  = "",
         .params     = "",
         .help       = "cancel the current VM migration",

-        .mhandler.cmd = hmp_migrate_cancel,
+        .cmd        = hmp_migrate_cancel,

     },
 
 STEXI
     },
 
 STEXI


@@ -916,7 +933,7 @@ ETEXI
         .args_type  = "uri:s",
         .params     = "uri",
         .help       = "Continue an incoming migration from an -incoming defer",
         .args_type  = "uri:s",
         .params     = "uri",
         .help       = "Continue an incoming migration from an -incoming defer",

-        .mhandler.cmd = hmp_migrate_incoming,
+        .cmd        = hmp_migrate_incoming,

     },
 
 STEXI
     },
 
 STEXI


@@ -937,7 +954,7 @@ ETEXI
                       "The cache size affects the number of cache misses."
                       "In case of a high cache miss ratio you need to increase"
                       " the cache size",
                       "The cache size affects the number of cache misses."
                       "In case of a high cache miss ratio you need to increase"
                       " the cache size",

-        .mhandler.cmd = hmp_migrate_set_cache_size,
+        .cmd        = hmp_migrate_set_cache_size,

     },
 
 STEXI
     },
 
 STEXI


@@ -952,7 +969,7 @@ ETEXI
         .params     = "value",
         .help       = "set maximum speed (in bytes) for migrations. "
        "Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
         .params     = "value",
         .help       = "set maximum speed (in bytes) for migrations. "
        "Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",

-        .mhandler.cmd = hmp_migrate_set_speed,
+        .cmd        = hmp_migrate_set_speed,

     },
 
 STEXI
     },
 
 STEXI


@@ -966,7 +983,7 @@ ETEXI
         .args_type  = "value:T",
         .params     = "value",
         .help       = "set maximum tolerated downtime (in seconds) for migrations",
         .args_type  = "value:T",
         .params     = "value",
         .help       = "set maximum tolerated downtime (in seconds) for migrations",

-        .mhandler.cmd = hmp_migrate_set_downtime,
+        .cmd        = hmp_migrate_set_downtime,

     },
 
 STEXI
     },
 
 STEXI


@@ -980,7 +997,7 @@ ETEXI
         .args_type  = "capability:s,state:b",
         .params     = "capability state",
         .help       = "Enable/Disable the usage of a capability for migration",
         .args_type  = "capability:s,state:b",
         .params     = "capability state",
         .help       = "Enable/Disable the usage of a capability for migration",

-        .mhandler.cmd = hmp_migrate_set_capability,
+        .cmd        = hmp_migrate_set_capability,

         .command_completion = migrate_set_capability_completion,
     },
 
         .command_completion = migrate_set_capability_completion,
     },
 


@@ -992,10 +1009,10 @@ ETEXI
 
     {
         .name       = "migrate_set_parameter",
 
     {
         .name       = "migrate_set_parameter",

-        .args_type  = "parameter:s,value:i",
+        .args_type  = "parameter:s,value:s",

         .params     = "parameter value",
         .help       = "Set the parameter for migration",
         .params     = "parameter value",
         .help       = "Set the parameter for migration",

-        .mhandler.cmd = hmp_migrate_set_parameter,
+        .cmd        = hmp_migrate_set_parameter,

         .command_completion = migrate_set_parameter_completion,
     },
 
         .command_completion = migrate_set_parameter_completion,
     },
 


@@ -1003,6 +1020,23 @@ STEXI
 @item migrate_set_parameter @var{parameter} @var{value}
 @findex migrate_set_parameter
 Set the parameter @var{parameter} for migration.
 @item migrate_set_parameter @var{parameter} @var{value}
 @findex migrate_set_parameter
 Set the parameter @var{parameter} for migration.

+ETEXI
+
+    {
+        .name       = "migrate_start_postcopy",
+        .args_type  = "",
+        .params     = "",
+        .help       = "Followup to a migration command to switch the migration"
+                      " to postcopy mode. The postcopy-ram capability must "
+                      "be set before the original migration command.",
+        .cmd        = hmp_migrate_start_postcopy,
+    },
+
+STEXI
+@item migrate_start_postcopy
+@findex migrate_start_postcopy
+Switch in-progress migration to postcopy mode. Ignored after the end of
+migration (or once already in postcopy).

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1010,7 +1044,7 @@ ETEXI
         .args_type  = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
         .params     = "protocol hostname port tls-port cert-subject",
         .help       = "set migration information for remote display",
         .args_type  = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
         .params     = "protocol hostname port tls-port cert-subject",
         .help       = "set migration information for remote display",

-        .mhandler.cmd = hmp_client_migrate_info,
+        .cmd        = hmp_client_migrate_info,

     },
 
 STEXI
     },
 
 STEXI


@@ -1023,16 +1057,17 @@ ETEXI
 
     {
         .name       = "dump-guest-memory",
 
     {
         .name       = "dump-guest-memory",

-        .args_type  = "paging:-p,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?",
-        .params     = "[-p] [-z|-l|-s] filename [begin length]",
+        .args_type  = "paging:-p,detach:-d,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?",
+        .params     = "[-p] [-d] [-z|-l|-s] filename [begin length]",

         .help       = "dump guest memory into file 'filename'.\n\t\t\t"
                       "-p: do paging to get guest's memory mapping.\n\t\t\t"
         .help       = "dump guest memory into file 'filename'.\n\t\t\t"
                       "-p: do paging to get guest's memory mapping.\n\t\t\t"

+                      "-d: return immediately (do not wait for completion).\n\t\t\t"

                       "-z: dump in kdump-compressed format, with zlib compression.\n\t\t\t"
                       "-l: dump in kdump-compressed format, with lzo compression.\n\t\t\t"
                       "-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t"
                       "begin: the starting physical address.\n\t\t\t"
                       "length: the memory size, in bytes.",
                       "-z: dump in kdump-compressed format, with zlib compression.\n\t\t\t"
                       "-l: dump in kdump-compressed format, with lzo compression.\n\t\t\t"
                       "-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t"
                       "begin: the starting physical address.\n\t\t\t"
                       "length: the memory size, in bytes.",

-        .mhandler.cmd = hmp_dump_guest_memory,
+        .cmd        = hmp_dump_guest_memory,

     },
 
 
     },
 
 


@@ -1053,6 +1088,22 @@ gdb. Without -z|-l|-s, the dump format is ELF.
             together with begin.
 ETEXI
 
             together with begin.
 ETEXI
 

+#if defined(TARGET_S390X)
+    {
+        .name       = "dump-skeys",
+        .args_type  = "filename:F",
+        .params     = "",
+        .help       = "Save guest storage keys into file 'filename'.\n",
+        .cmd        = hmp_dump_skeys,
+    },
+#endif
+
+STEXI
+@item dump-skeys @var{filename}
+@findex dump-skeys
+Save guest storage keys to a file.
+ETEXI
+

     {
         .name       = "snapshot_blkdev",
         .args_type  = "reuse:-n,device:B,snapshot-file:s?,format:s?",
     {
         .name       = "snapshot_blkdev",
         .args_type  = "reuse:-n,device:B,snapshot-file:s?,format:s?",


@@ -1065,7 +1116,7 @@ ETEXI
                       "The default format is qcow2.  The -n flag requests QEMU\n\t\t\t"
                       "to reuse the image found in new-image-file, instead of\n\t\t\t"
                       "recreating it from scratch.",
                       "The default format is qcow2.  The -n flag requests QEMU\n\t\t\t"
                       "to reuse the image found in new-image-file, instead of\n\t\t\t"
                       "recreating it from scratch.",

-        .mhandler.cmd = hmp_snapshot_blkdev,
+        .cmd        = hmp_snapshot_blkdev,

     },
 
 STEXI
     },
 
 STEXI


@@ -1081,7 +1132,7 @@ ETEXI
         .help       = "take an internal snapshot of device.\n\t\t\t"
                       "The format of the image used by device must\n\t\t\t"
                       "support it, such as qcow2.\n\t\t\t",
         .help       = "take an internal snapshot of device.\n\t\t\t"
                       "The format of the image used by device must\n\t\t\t"
                       "support it, such as qcow2.\n\t\t\t",

-        .mhandler.cmd = hmp_snapshot_blkdev_internal,
+        .cmd        = hmp_snapshot_blkdev_internal,

     },
 
 STEXI
     },
 
 STEXI


@@ -1099,7 +1150,7 @@ ETEXI
                       "the snapshot matching both id and name.\n\t\t\t"
                       "The format of the image used by device must\n\t\t\t"
                       "support it, such as qcow2.\n\t\t\t",
                       "the snapshot matching both id and name.\n\t\t\t"
                       "The format of the image used by device must\n\t\t\t"
                       "support it, such as qcow2.\n\t\t\t",

-        .mhandler.cmd = hmp_snapshot_delete_blkdev_internal,
+        .cmd        = hmp_snapshot_delete_blkdev_internal,

     },
 
 STEXI
     },
 
 STEXI


@@ -1120,7 +1171,7 @@ ETEXI
                       "in new-image-file, instead of recreating it from scratch.\n\t\t\t"
                       "The -f flag requests QEMU to copy the whole disk,\n\t\t\t"
                       "so that the result does not need a backing file.\n\t\t\t",
                       "in new-image-file, instead of recreating it from scratch.\n\t\t\t"
                       "The -f flag requests QEMU to copy the whole disk,\n\t\t\t"
                       "so that the result does not need a backing file.\n\t\t\t",

-        .mhandler.cmd = hmp_drive_mirror,
+        .cmd        = hmp_drive_mirror,

     },
 STEXI
 @item drive_mirror
     },
 STEXI
 @item drive_mirror


@@ -1131,8 +1182,8 @@ ETEXI
 
     {
         .name       = "drive_backup",
 
     {
         .name       = "drive_backup",

-        .args_type  = "reuse:-n,full:-f,device:B,target:s,format:s?",
-        .params     = "[-n] [-f] device target [format]",
+        .args_type  = "reuse:-n,full:-f,compress:-c,device:B,target:s,format:s?",
+        .params     = "[-n] [-f] [-c] device target [format]",

         .help       = "initiates a point-in-time\n\t\t\t"
                       "copy for a device. The device's contents are\n\t\t\t"
                       "copied to the new image file, excluding data that\n\t\t\t"
         .help       = "initiates a point-in-time\n\t\t\t"
                       "copy for a device. The device's contents are\n\t\t\t"
                       "copied to the new image file, excluding data that\n\t\t\t"


@@ -1140,8 +1191,10 @@ ETEXI
                       "The -n flag requests QEMU to reuse the image found\n\t\t\t"
                       "in new-image-file, instead of recreating it from scratch.\n\t\t\t"
                       "The -f flag requests QEMU to copy the whole disk,\n\t\t\t"
                       "The -n flag requests QEMU to reuse the image found\n\t\t\t"
                       "in new-image-file, instead of recreating it from scratch.\n\t\t\t"
                       "The -f flag requests QEMU to copy the whole disk,\n\t\t\t"

-                      "so that the result does not need a backing file.\n\t\t\t",
-        .mhandler.cmd = hmp_drive_backup,
+                      "so that the result does not need a backing file.\n\t\t\t"
+                      "The -c flag requests QEMU to compress backup data\n\t\t\t"
+                      "(if the target format supports it).\n\t\t\t",
+        .cmd        = hmp_drive_backup,

     },
 STEXI
 @item drive_backup
     },
 STEXI
 @item drive_backup


@@ -1151,15 +1204,15 @@ ETEXI
 
     {
         .name       = "drive_add",
 
     {
         .name       = "drive_add",

-        .args_type  = "pci_addr:s,opts:s",
-        .params     = "[[<domain>:]<bus>:]<slot>\n"
+        .args_type  = "node:-n,pci_addr:s,opts:s",
+        .params     = "[-n] [[<domain>:]<bus>:]<slot>\n"

                       "[file=file][,if=type][,bus=n]\n"
                       "[,unit=m][,media=d][,index=i]\n"
                       "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
                       "[,snapshot=on|off][,cache=on|off]\n"
                       "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",
                       "[file=file][,if=type][,bus=n]\n"
                       "[,unit=m][,media=d][,index=i]\n"
                       "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
                       "[,snapshot=on|off][,cache=on|off]\n"
                       "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",

-        .mhandler.cmd = hmp_drive_add,
+        .cmd        = hmp_drive_add,

     },
 
 STEXI
     },
 
 STEXI


@@ -1183,7 +1236,7 @@ ETEXI
                       "<error_status> = error string or 32bit\n\t\t\t"
                       "<tlb header> = 32bit x 4\n\t\t\t"
                       "<tlb header prefix> = 32bit x 4",
                       "<error_status> = error string or 32bit\n\t\t\t"
                       "<tlb header> = 32bit x 4\n\t\t\t"
                       "<tlb header prefix> = 32bit x 4",

-        .mhandler.cmd = hmp_pcie_aer_inject_error,
+        .cmd        = hmp_pcie_aer_inject_error,

     },
 
 STEXI
     },
 
 STEXI


@@ -1197,7 +1250,7 @@ ETEXI
         .args_type  = "device:s,opts:s?",
         .params     = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]",
         .help       = "add host VLAN client",
         .args_type  = "device:s,opts:s?",
         .params     = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]",
         .help       = "add host VLAN client",

-        .mhandler.cmd = hmp_host_net_add,
+        .cmd        = hmp_host_net_add,

         .command_completion = host_net_add_completion,
     },
 
         .command_completion = host_net_add_completion,
     },
 


@@ -1212,7 +1265,7 @@ ETEXI
         .args_type  = "vlan_id:i,device:s",
         .params     = "vlan_id name",
         .help       = "remove host VLAN client",
         .args_type  = "vlan_id:i,device:s",
         .params     = "vlan_id name",
         .help       = "remove host VLAN client",

-        .mhandler.cmd = hmp_host_net_remove,
+        .cmd        = hmp_host_net_remove,

         .command_completion = host_net_remove_completion,
     },
 
         .command_completion = host_net_remove_completion,
     },
 


@@ -1227,7 +1280,7 @@ ETEXI
         .args_type  = "netdev:O",
         .params     = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user],id=str[,prop=value][,...]",
         .help       = "add host network device",
         .args_type  = "netdev:O",
         .params     = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user],id=str[,prop=value][,...]",
         .help       = "add host network device",

-        .mhandler.cmd = hmp_netdev_add,
+        .cmd        = hmp_netdev_add,

         .command_completion = netdev_add_completion,
     },
 
         .command_completion = netdev_add_completion,
     },
 


@@ -1242,7 +1295,7 @@ ETEXI
         .args_type  = "id:s",
         .params     = "id",
         .help       = "remove host network device",
         .args_type  = "id:s",
         .params     = "id",
         .help       = "remove host network device",

-        .mhandler.cmd = hmp_netdev_del,
+        .cmd        = hmp_netdev_del,

         .command_completion = netdev_del_completion,
     },
 
         .command_completion = netdev_del_completion,
     },
 


@@ -1257,7 +1310,7 @@ ETEXI
         .args_type  = "object:O",
         .params     = "[qom-type=]type,id=str[,prop=value][,...]",
         .help       = "create QOM object",
         .args_type  = "object:O",
         .params     = "[qom-type=]type,id=str[,prop=value][,...]",
         .help       = "create QOM object",

-        .mhandler.cmd = hmp_object_add,
+        .cmd        = hmp_object_add,

         .command_completion = object_add_completion,
     },
 
         .command_completion = object_add_completion,
     },
 


@@ -1272,7 +1325,7 @@ ETEXI
         .args_type  = "id:s",
         .params     = "id",
         .help       = "destroy QOM object",
         .args_type  = "id:s",
         .params     = "id",
         .help       = "destroy QOM object",

-        .mhandler.cmd = hmp_object_del,
+        .cmd        = hmp_object_del,

         .command_completion = object_del_completion,
     },
 
         .command_completion = object_del_completion,
     },
 


@@ -1288,7 +1341,7 @@ ETEXI
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
         .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
         .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
         .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
         .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",

-        .mhandler.cmd = hmp_hostfwd_add,
+        .cmd        = hmp_hostfwd_add,

     },
 #endif
 STEXI
     },
 #endif
 STEXI


@@ -1303,7 +1356,7 @@ ETEXI
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
         .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
         .help       = "remove host-to-guest TCP or UDP redirection",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
         .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
         .help       = "remove host-to-guest TCP or UDP redirection",

-        .mhandler.cmd = hmp_hostfwd_remove,
+        .cmd        = hmp_hostfwd_remove,

     },
 
 #endif
     },
 
 #endif


@@ -1318,7 +1371,7 @@ ETEXI
         .args_type  = "value:M",
         .params     = "target",
         .help       = "request VM to change its memory allocation (in MB)",
         .args_type  = "value:M",
         .params     = "target",
         .help       = "request VM to change its memory allocation (in MB)",

-        .mhandler.cmd = hmp_balloon,
+        .cmd        = hmp_balloon,

     },
 
 STEXI
     },
 
 STEXI


@@ -1332,7 +1385,7 @@ ETEXI
         .args_type  = "name:s,up:b",
         .params     = "name on|off",
         .help       = "change the link status of a network adapter",
         .args_type  = "name:s,up:b",
         .params     = "name on|off",
         .help       = "change the link status of a network adapter",

-        .mhandler.cmd = hmp_set_link,
+        .cmd        = hmp_set_link,

         .command_completion = set_link_completion,
     },
 
         .command_completion = set_link_completion,
     },
 


@@ -1347,7 +1400,7 @@ ETEXI
         .args_type  = "action:s",
         .params     = "[reset|shutdown|poweroff|pause|debug|none]",
         .help       = "change watchdog action",
         .args_type  = "action:s",
         .params     = "[reset|shutdown|poweroff|pause|debug|none]",
         .help       = "change watchdog action",

-        .mhandler.cmd = hmp_watchdog_action,
+        .cmd        = hmp_watchdog_action,

         .command_completion = watchdog_action_completion,
     },
 
         .command_completion = watchdog_action_completion,
     },
 


@@ -1362,7 +1415,7 @@ ETEXI
         .args_type  = "aclname:s",
         .params     = "aclname",
         .help       = "list rules in the access control list",
         .args_type  = "aclname:s",
         .params     = "aclname",
         .help       = "list rules in the access control list",

-        .mhandler.cmd = hmp_acl_show,
+        .cmd        = hmp_acl_show,

     },
 
 STEXI
     },
 
 STEXI


@@ -1379,7 +1432,7 @@ ETEXI
         .args_type  = "aclname:s,policy:s",
         .params     = "aclname allow|deny",
         .help       = "set default access control list policy",
         .args_type  = "aclname:s,policy:s",
         .params     = "aclname allow|deny",
         .help       = "set default access control list policy",

-        .mhandler.cmd = hmp_acl_policy,
+        .cmd        = hmp_acl_policy,

     },
 
 STEXI
     },
 
 STEXI


@@ -1395,7 +1448,7 @@ ETEXI
         .args_type  = "aclname:s,match:s,policy:s,index:i?",
         .params     = "aclname match allow|deny [index]",
         .help       = "add a match rule to the access control list",
         .args_type  = "aclname:s,match:s,policy:s,index:i?",
         .params     = "aclname match allow|deny [index]",
         .help       = "add a match rule to the access control list",

-        .mhandler.cmd = hmp_acl_add,
+        .cmd        = hmp_acl_add,

     },
 
 STEXI
     },
 
 STEXI


@@ -1414,7 +1467,7 @@ ETEXI
         .args_type  = "aclname:s,match:s",
         .params     = "aclname match",
         .help       = "remove a match rule from the access control list",
         .args_type  = "aclname:s,match:s",
         .params     = "aclname match",
         .help       = "remove a match rule from the access control list",

-        .mhandler.cmd = hmp_acl_remove,
+        .cmd        = hmp_acl_remove,

     },
 
 STEXI
     },
 
 STEXI


@@ -1428,7 +1481,7 @@ ETEXI
         .args_type  = "aclname:s",
         .params     = "aclname",
         .help       = "reset the access control list",
         .args_type  = "aclname:s",
         .params     = "aclname",
         .help       = "reset the access control list",

-        .mhandler.cmd = hmp_acl_reset,
+        .cmd        = hmp_acl_reset,

     },
 
 STEXI
     },
 
 STEXI


@@ -1443,7 +1496,7 @@ ETEXI
         .args_type  = "all:-a,writable:-w,uri:s",
         .params     = "nbd_server_start [-a] [-w] host:port",
         .help       = "serve block devices on the given host and port",
         .args_type  = "all:-a,writable:-w,uri:s",
         .params     = "nbd_server_start [-a] [-w] host:port",
         .help       = "serve block devices on the given host and port",

-        .mhandler.cmd = hmp_nbd_server_start,
+        .cmd        = hmp_nbd_server_start,

     },
 STEXI
 @item nbd_server_start @var{host}:@var{port}
     },
 STEXI
 @item nbd_server_start @var{host}:@var{port}


@@ -1459,7 +1512,7 @@ ETEXI
         .args_type  = "writable:-w,device:B",
         .params     = "nbd_server_add [-w] device",
         .help       = "export a block device via NBD",
         .args_type  = "writable:-w,device:B",
         .params     = "nbd_server_add [-w] device",
         .help       = "export a block device via NBD",

-        .mhandler.cmd = hmp_nbd_server_add,
+        .cmd        = hmp_nbd_server_add,

     },
 STEXI
 @item nbd_server_add @var{device}
     },
 STEXI
 @item nbd_server_add @var{device}


@@ -1474,7 +1527,7 @@ ETEXI
         .args_type  = "",
         .params     = "nbd_server_stop",
         .help       = "stop serving block devices using the NBD protocol",
         .args_type  = "",
         .params     = "nbd_server_stop",
         .help       = "stop serving block devices using the NBD protocol",

-        .mhandler.cmd = hmp_nbd_server_stop,
+        .cmd        = hmp_nbd_server_stop,

     },
 STEXI
 @item nbd_server_stop
     },
 STEXI
 @item nbd_server_stop


@@ -1490,7 +1543,7 @@ ETEXI
         .args_type  = "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
         .params     = "[-b] cpu bank status mcgstatus addr misc",
         .help       = "inject a MCE on the given CPU [and broadcast to other CPUs with -b option]",
         .args_type  = "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
         .params     = "[-b] cpu bank status mcgstatus addr misc",
         .help       = "inject a MCE on the given CPU [and broadcast to other CPUs with -b option]",

-        .mhandler.cmd = hmp_mce,
+        .cmd        = hmp_mce,

     },
 
 #endif
     },
 
 #endif


@@ -1505,7 +1558,7 @@ ETEXI
         .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 = hmp_getfd,
+        .cmd        = hmp_getfd,

     },
 
 STEXI
     },
 
 STEXI


@@ -1521,7 +1574,7 @@ ETEXI
         .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 = hmp_closefd,
+        .cmd        = hmp_closefd,

     },
 
 STEXI
     },
 
 STEXI


@@ -1537,7 +1590,7 @@ ETEXI
         .args_type  = "device:B,password:s",
         .params     = "block_passwd device password",
         .help       = "set the password of encrypted block devices",
         .args_type  = "device:B,password:s",
         .params     = "block_passwd device password",
         .help       = "set the password of encrypted block devices",

-        .mhandler.cmd = hmp_block_passwd,
+        .cmd        = hmp_block_passwd,

     },
 
 STEXI
     },
 
 STEXI


@@ -1551,7 +1604,7 @@ ETEXI
         .args_type  = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l",
         .params     = "device bps bps_rd bps_wr iops iops_rd iops_wr",
         .help       = "change I/O throttle limits for a block drive",
         .args_type  = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l",
         .params     = "device bps bps_rd bps_wr iops iops_rd iops_wr",
         .help       = "change I/O throttle limits for a block drive",

-        .mhandler.cmd = hmp_block_set_io_throttle,
+        .cmd        = hmp_block_set_io_throttle,

     },
 
 STEXI
     },
 
 STEXI


@@ -1565,7 +1618,7 @@ ETEXI
         .args_type  = "protocol:s,password:s,connected:s?",
         .params     = "protocol password action-if-connected",
         .help       = "set spice/vnc password",
         .args_type  = "protocol:s,password:s,connected:s?",
         .params     = "protocol password action-if-connected",
         .help       = "set spice/vnc password",

-        .mhandler.cmd = hmp_set_password,
+        .cmd        = hmp_set_password,

     },
 
 STEXI
     },
 
 STEXI


@@ -1584,7 +1637,7 @@ ETEXI
         .args_type  = "protocol:s,time:s",
         .params     = "protocol time",
         .help       = "set spice/vnc password expire-time",
         .args_type  = "protocol:s,time:s",
         .params     = "protocol time",
         .help       = "set spice/vnc password expire-time",

-        .mhandler.cmd = hmp_expire_password,
+        .cmd        = hmp_expire_password,

     },
 
 STEXI
     },
 
 STEXI


@@ -1615,7 +1668,7 @@ ETEXI
         .args_type  = "args:s",
         .params     = "args",
         .help       = "add chardev",
         .args_type  = "args:s",
         .params     = "args",
         .help       = "add chardev",

-        .mhandler.cmd = hmp_chardev_add,
+        .cmd        = hmp_chardev_add,

         .command_completion = chardev_add_completion,
     },
 
         .command_completion = chardev_add_completion,
     },
 


@@ -1631,7 +1684,7 @@ ETEXI
         .args_type  = "id:s",
         .params     = "id",
         .help       = "remove chardev",
         .args_type  = "id:s",
         .params     = "id",
         .help       = "remove chardev",

-        .mhandler.cmd = hmp_chardev_remove,
+        .cmd        = hmp_chardev_remove,

         .command_completion = chardev_remove_completion,
     },
 
         .command_completion = chardev_remove_completion,
     },
 


@@ -1647,7 +1700,7 @@ ETEXI
         .args_type  = "device:B,command:s",
         .params     = "[device] \"[command]\"",
         .help       = "run a qemu-io command on a block device",
         .args_type  = "device:B,command:s",
         .params     = "[device] \"[command]\"",
         .help       = "run a qemu-io command on a block device",

-        .mhandler.cmd = hmp_qemu_io,
+        .cmd        = hmp_qemu_io,

     },
 
 STEXI
     },
 
 STEXI


@@ -1662,7 +1715,7 @@ ETEXI
         .args_type  = "id:i",
         .params     = "id",
         .help       = "add cpu",
         .args_type  = "id:i",
         .params     = "id",
         .help       = "add cpu",

-        .mhandler.cmd  = hmp_cpu_add,
+        .cmd        = hmp_cpu_add,

     },
 
 STEXI
     },
 
 STEXI


@@ -1676,7 +1729,7 @@ ETEXI
         .args_type  = "path:s?",
         .params     = "path",
         .help       = "list QOM properties",
         .args_type  = "path:s?",
         .params     = "path",
         .help       = "list QOM properties",

-        .mhandler.cmd  = hmp_qom_list,
+        .cmd        = hmp_qom_list,

     },
 
 STEXI
     },
 
 STEXI


@@ -1689,7 +1742,7 @@ ETEXI
         .args_type  = "path:s,property:s,value:s",
         .params     = "path property value",
         .help       = "set QOM property",
         .args_type  = "path:s,property:s,value:s",
         .params     = "path property value",
         .help       = "set QOM property",

-        .mhandler.cmd  = hmp_qom_set,
+        .cmd        = hmp_qom_set,

     },
 
 STEXI
     },
 
 STEXI


@@ -1702,102 +1755,10 @@ ETEXI
         .args_type  = "item:s?",
         .params     = "[subcommand]",
         .help       = "show various information about the system state",
         .args_type  = "item:s?",
         .params     = "[subcommand]",
         .help       = "show various information about the system state",

-        .mhandler.cmd = hmp_info_help,
-        .sub_table = info_cmds,
+        .cmd        = hmp_info_help,
+        .sub_table  = info_cmds,

     },
 
     },
 

-STEXI
-@item info @var{subcommand}
-@findex info
-Show various information about the system state.
-
-@table @option
-@item info version
-show the version of QEMU
-@item info network
-show the various VLANs and the associated devices
-@item info chardev
-show the character devices
-@item info block
-show the block devices
-@item info blockstats
-show block device statistics
-@item info registers
-show the cpu registers
-@item info cpus
-show infos for each CPU
-@item info history
-show the command line history
-@item info irq
-show the interrupts statistics (if available)
-@item info pic
-show i8259 (PIC) state
-@item info pci
-show emulated PCI device info
-@item info tlb
-show virtual to physical memory mappings (i386, SH4, SPARC, PPC, and Xtensa only)
-@item info mem
-show the active virtual memory mappings (i386 only)
-@item info jit
-show dynamic compiler info
-@item info numa
-show NUMA information
-@item info kvm
-show KVM information
-@item info usb
-show USB devices plugged on the virtual USB hub
-@item info usbhost
-show all USB host devices
-@item info profile
-show profiling information
-@item info capture
-show information about active capturing
-@item info snapshots
-show list of VM snapshots
-@item info status
-show the current VM status (running|paused)
-@item info mice
-show which guest mouse is receiving events
-@item info vnc
-show the vnc server status
-@item info name
-show the current VM name
-@item info uuid
-show the current VM UUID
-@item info cpustats
-show CPU statistics
-@item info usernet
-show user network stack connection states
-@item info migrate
-show migration status
-@item info migrate_capabilities
-show current migration capabilities
-@item info migrate_parameters
-show current migration parameters
-@item info migrate_cache_size
-show current migration XBZRLE cache size
-@item info balloon
-show balloon information
-@item info qtree
-show device tree
-@item info qdm
-show qdev device model list
-@item info qom-tree
-show object composition tree
-@item info roms
-show roms
-@item info tpm
-show the TPM device
-@item info memory-devices
-show the memory devices
-@end table
-ETEXI
-
-STEXI
-@item info trace-events
-show available trace events and their state
-ETEXI
-

 STEXI
 @end table
 ETEXI
 STEXI
 @end table
 ETEXI