target/m68k: implement fatanh

[qemu.git] / hmp-commands.hx

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 4f4f60a0dfd20bd6d37f19ceda17579098eb885e..1723cbe1df18eed970db29df64b8b8b47508b64e 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


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

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

     },
 
 STEXI
     },
 
 STEXI


@@ -253,10 +253,11 @@ ETEXI
 
     {
         .name       = "screendump",
 
     {
         .name       = "screendump",

-        .args_type  = "filename:F",
-        .params     = "filename",
-        .help       = "save screen into PPM image 'filename'",
-        .mhandler.cmd = hmp_screendump,
+        .args_type  = "filename:F,device:s?,head:i?",
+        .params     = "filename [device [head]]",
+        .help       = "save screen from head 'head' of display device 'device' "
+                      "into PPM image 'filename'",
+        .cmd        = hmp_screendump,

     },
 
 STEXI
     },
 
 STEXI


@@ -270,7 +271,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


@@ -281,10 +282,11 @@ 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,
     },
 
         .command_completion = trace_event_completion,
     },
 


@@ -300,7 +302,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


@@ -315,7 +317,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


@@ -329,7 +331,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


@@ -346,7 +348,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,
     },
 


@@ -362,7 +364,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,
     },
 


@@ -377,7 +379,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


@@ -392,7 +394,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "stop emulation",
         .args_type  = "",
         .params     = "",
         .help       = "stop emulation",

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

     },
 
 STEXI
     },
 
 STEXI


@@ -406,7 +408,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "resume emulation",
         .args_type  = "",
         .params     = "",
         .help       = "resume emulation",

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

     },
 
 STEXI
     },
 
 STEXI


@@ -420,7 +422,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


@@ -434,7 +436,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


@@ -448,7 +450,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


@@ -462,7 +464,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


@@ -522,6 +524,38 @@ Dump 80 16 bit values at the start of the video memory.
 0x000b8090: 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720
 @end smallexample
 @end itemize
 0x000b8090: 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720
 @end smallexample
 @end itemize

+ETEXI
+
+    {
+        .name       = "gpa2hva",
+        .args_type  = "addr:l",
+        .params     = "addr",
+        .help       = "print the host virtual address corresponding to a guest physical address",
+        .cmd        = hmp_gpa2hva,
+    },
+
+STEXI
+@item gpa2hva @var{addr}
+@findex gpa2hva
+Print the host virtual address at which the guest's physical address @var{addr}
+is mapped.
+ETEXI
+
+#ifdef CONFIG_LINUX
+    {
+        .name       = "gpa2hpa",
+        .args_type  = "addr:l",
+        .params     = "addr",
+        .help       = "print the host physical address corresponding to a guest physical address",
+        .cmd        = hmp_gpa2hpa,
+    },
+#endif
+
+STEXI
+@item gpa2hpa @var{addr}
+@findex gpa2hpa
+Print the host physical address at which the guest's physical address @var{addr}
+is mapped.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -529,7 +563,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


@@ -544,7 +578,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


@@ -558,7 +592,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


@@ -572,7 +606,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,
     },
 


@@ -595,7 +629,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


@@ -609,7 +643,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


@@ -623,44 +657,13 @@ 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
 @item sum @var{addr} @var{size}
 @findex sum
 Compute the checksum of a memory region.
     },
 
 STEXI
 @item sum @var{addr} @var{size}
 @findex sum
 Compute the checksum of a memory region.

-ETEXI
-
-    {
-        .name       = "usb_add",
-        .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,
-    },
-
-STEXI
-@item usb_add @var{devname}
-@findex usb_add
-Add the USB device @var{devname}.  For details of available devices see
-@ref{usb_devices}
-ETEXI
-
-    {
-        .name       = "usb_del",
-        .args_type  = "devname:s",
-        .params     = "device",
-        .help       = "remove USB device 'bus.addr'",
-        .mhandler.cmd = hmp_usb_del,
-    },
-
-STEXI
-@item usb_del @var{devname}
-@findex usb_del
-Remove the USB device @var{devname} from the QEMU virtual USB
-hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor
-command @code{info usb} to see the devices you can remove.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -668,7 +671,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,
     },
 


@@ -683,7 +686,7 @@ 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,
     },
 
         .command_completion = device_del_completion,
     },
 


@@ -699,7 +702,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


@@ -713,7 +716,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


@@ -728,7 +731,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


@@ -742,7 +745,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


@@ -760,7 +763,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}]]]


@@ -781,7 +784,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}


@@ -797,7 +800,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


@@ -811,7 +814,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


@@ -825,7 +828,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


@@ -843,7 +846,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}


@@ -857,7 +860,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,
     },
 


@@ -874,7 +877,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,
     },
 


@@ -900,7 +903,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,

     },
 
 
     },
 
 


@@ -917,14 +920,26 @@ 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
 @item migrate_cancel
 @findex migrate_cancel
 Cancel the current VM migration.
     },
 
 STEXI
 @item migrate_cancel
 @findex migrate_cancel
 Cancel the current VM migration.

+ETEXI

 
 

+    {
+        .name       = "migrate_continue",
+        .args_type  = "state:s",
+        .params     = "state",
+        .help       = "Continue migration from the given paused state",
+        .cmd        = hmp_migrate_continue,
+    },
+STEXI
+@item migrate_continue @var{state}
+@findex migrate_continue
+Continue migration from the paused state @var{state}

 ETEXI
 
     {
 ETEXI
 
     {


@@ -932,7 +947,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


@@ -953,7 +968,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


@@ -968,7 +983,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


@@ -982,7 +997,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


@@ -996,7 +1011,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,
     },
 


@@ -1008,10 +1023,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,
     },
 


@@ -1027,8 +1042,9 @@ ETEXI
         .params     = "",
         .help       = "Followup to a migration command to switch the migration"
                       " to postcopy mode. The postcopy-ram capability must "
         .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.",
-        .mhandler.cmd = hmp_migrate_start_postcopy,
+                      "be set on both source and destination before the "
+                      "original migration command .",
+        .cmd        = hmp_migrate_start_postcopy,

     },
 
 STEXI
     },
 
 STEXI


@@ -1036,6 +1052,21 @@ STEXI
 @findex migrate_start_postcopy
 Switch in-progress migration to postcopy mode. Ignored after the end of
 migration (or once already in postcopy).
 @findex migrate_start_postcopy
 Switch in-progress migration to postcopy mode. Ignored after the end of
 migration (or once already in postcopy).

+ETEXI
+
+    {
+        .name       = "x_colo_lost_heartbeat",
+        .args_type  = "",
+        .params     = "",
+        .help       = "Tell COLO that heartbeat is lost,\n\t\t\t"
+                      "a failover or takeover is needed.",
+        .cmd = hmp_x_colo_lost_heartbeat,
+    },
+
+STEXI
+@item x_colo_lost_heartbeat
+@findex x_colo_lost_heartbeat
+Tell COLO that heartbeat is lost, a failover or takeover is needed.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1043,7 +1074,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


@@ -1066,7 +1097,7 @@ ETEXI
                       "-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.",
                       "-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,

     },
 
 
     },
 
 


@@ -1093,7 +1124,7 @@ ETEXI
         .args_type  = "filename:F",
         .params     = "",
         .help       = "Save guest storage keys into file 'filename'.\n",
         .args_type  = "filename:F",
         .params     = "",
         .help       = "Save guest storage keys into file 'filename'.\n",

-        .mhandler.cmd = hmp_dump_skeys,
+        .cmd        = hmp_dump_skeys,

     },
 #endif
 
     },
 #endif
 


@@ -1101,6 +1132,22 @@ STEXI
 @item dump-skeys @var{filename}
 @findex dump-skeys
 Save guest storage keys to a file.
 @item dump-skeys @var{filename}
 @findex dump-skeys
 Save guest storage keys to a file.

+ETEXI
+
+#if defined(TARGET_S390X)
+    {
+        .name       = "migration_mode",
+        .args_type  = "mode:i",
+        .params     = "mode",
+        .help       = "Enables or disables migration mode\n",
+        .cmd        = hmp_migrationmode,
+    },
+#endif
+
+STEXI
+@item migration_mode @var{mode}
+@findex migration_mode
+Enables or disables migration mode.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1115,7 +1162,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


@@ -1131,7 +1178,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


@@ -1149,7 +1196,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


@@ -1170,7 +1217,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


@@ -1181,8 +1228,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"


@@ -1190,8 +1237,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


@@ -1209,7 +1258,7 @@ ETEXI
                       "[,snapshot=on|off][,cache=on|off]\n"
                       "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",
                       "[,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


@@ -1233,43 +1282,13 @@ 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
 @item pcie_aer_inject_error
 @findex pcie_aer_inject_error
 Inject PCIe AER error
     },
 
 STEXI
 @item pcie_aer_inject_error
 @findex pcie_aer_inject_error
 Inject PCIe AER error

-ETEXI
-
-    {
-        .name       = "host_net_add",
-        .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,
-        .command_completion = host_net_add_completion,
-    },
-
-STEXI
-@item host_net_add
-@findex host_net_add
-Add host VLAN client.
-ETEXI
-
-    {
-        .name       = "host_net_remove",
-        .args_type  = "vlan_id:i,device:s",
-        .params     = "vlan_id name",
-        .help       = "remove host VLAN client",
-        .mhandler.cmd = hmp_host_net_remove,
-        .command_completion = host_net_remove_completion,
-    },
-
-STEXI
-@item host_net_remove
-@findex host_net_remove
-Remove host VLAN client.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1277,7 +1296,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,
     },
 


@@ -1292,7 +1311,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,
     },
 


@@ -1307,7 +1326,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,
     },
 


@@ -1322,7 +1341,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,
     },
 


@@ -1336,9 +1355,9 @@ ETEXI
     {
         .name       = "hostfwd_add",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
     {
         .name       = "hostfwd_add",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",

-        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",

         .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",
         .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


@@ -1351,9 +1370,9 @@ ETEXI
     {
         .name       = "hostfwd_remove",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
     {
         .name       = "hostfwd_remove",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",

-        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport",

         .help       = "remove host-to-guest TCP or UDP redirection",
         .help       = "remove host-to-guest TCP or UDP redirection",

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

     },
 
 #endif
     },
 
 #endif


@@ -1368,7 +1387,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


@@ -1382,7 +1401,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,
     },
 


@@ -1397,7 +1416,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,
     },
 


@@ -1412,7 +1431,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


@@ -1429,7 +1448,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


@@ -1445,7 +1464,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


@@ -1464,7 +1483,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


@@ -1478,7 +1497,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


@@ -1493,7 +1512,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}


@@ -1506,17 +1525,35 @@ ETEXI
 
     {
         .name       = "nbd_server_add",
 
     {
         .name       = "nbd_server_add",

-        .args_type  = "writable:-w,device:B",
-        .params     = "nbd_server_add [-w] device",
+        .args_type  = "writable:-w,device:B,name:s?",
+        .params     = "nbd_server_add [-w] device [name]",

         .help       = "export a block device via NBD",
         .help       = "export a block device via NBD",

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

     },
 STEXI
     },
 STEXI

-@item nbd_server_add @var{device}
+@item nbd_server_add @var{device} [ @var{name} ]

 @findex nbd_server_add
 Export a block device through QEMU's NBD server, which must be started
 beforehand with @command{nbd_server_start}.  The @option{-w} option makes the
 @findex nbd_server_add
 Export a block device through QEMU's NBD server, which must be started
 beforehand with @command{nbd_server_start}.  The @option{-w} option makes the

-exported device writable too.
+exported device writable too.  The export name is controlled by @var{name},
+defaulting to @var{device}.
+ETEXI
+
+    {
+        .name       = "nbd_server_remove",
+        .args_type  = "force:-f,name:s",
+        .params     = "nbd_server_remove [-f] name",
+        .help       = "remove an export previously exposed via NBD",
+        .cmd        = hmp_nbd_server_remove,
+    },
+STEXI
+@item nbd_server_remove [-f] @var{name}
+@findex nbd_server_remove
+Stop exporting a block device through QEMU's NBD server, which was
+previously started with @command{nbd_server_add}.  The @option{-f}
+option forces the server to drop the export immediately even if
+clients are connected; otherwise the command fails unless there are no
+clients.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1524,7 +1561,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


@@ -1540,7 +1577,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


@@ -1555,7 +1592,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


@@ -1571,7 +1608,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


@@ -1587,13 +1624,15 @@ 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
 @item block_passwd @var{device} @var{password}
 @findex block_passwd
 Set the encrypted device @var{device} password to @var{password}
     },
 
 STEXI
 @item block_passwd @var{device} @var{password}
 @findex block_passwd
 Set the encrypted device @var{device} password to @var{password}

+
+This command is now obsolete and will always return an error since 2.10

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1601,7 +1640,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


@@ -1615,7 +1654,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


@@ -1634,7 +1673,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


@@ -1665,14 +1704,30 @@ 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,
     },
 
 STEXI
 @item chardev-add args
 @findex chardev-add
         .command_completion = chardev_add_completion,
     },
 
 STEXI
 @item chardev-add args
 @findex chardev-add

-chardev_add accepts the same parameters as the -chardev command line switch.
+chardev-add accepts the same parameters as the -chardev command line switch.
+
+ETEXI
+
+    {
+        .name       = "chardev-change",
+        .args_type  = "id:s,args:s",
+        .params     = "id args",
+        .help       = "change chardev",
+        .cmd        = hmp_chardev_change,
+    },
+
+STEXI
+@item chardev-change args
+@findex chardev-change
+chardev-change accepts existing chardev @var{id} and then the same arguments
+as the -chardev command line switch (except for "id").

 
 ETEXI
 
 
 ETEXI
 


@@ -1681,7 +1736,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,
     },
 


@@ -1690,6 +1745,22 @@ STEXI
 @findex chardev-remove
 Removes the chardev @var{id}.
 
 @findex chardev-remove
 Removes the chardev @var{id}.
 

+ETEXI
+
+    {
+        .name       = "chardev-send-break",
+        .args_type  = "id:s",
+        .params     = "id",
+        .help       = "send a break on chardev",
+        .cmd        = hmp_chardev_send_break,
+        .command_completion = chardev_remove_completion,
+    },
+
+STEXI
+@item chardev-send-break id
+@findex chardev-send-break
+Send a break on the chardev @var{id}.
+

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1697,7 +1768,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


@@ -1712,7 +1783,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


@@ -1726,7 +1797,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


@@ -1739,7 +1810,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


@@ -1752,8 +1823,8 @@ 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
     },
 
 STEXI