From patchwork Wed Sep 16 21:32:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 33743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A8BA6B7B73 for ; Thu, 17 Sep 2009 07:35:51 +1000 (EST) Received: from localhost ([127.0.0.1]:51146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo2AC-0007bS-Kk for incoming@patchwork.ozlabs.org; Wed, 16 Sep 2009 17:35:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mo27X-0006h5-Li for qemu-devel@nongnu.org; Wed, 16 Sep 2009 17:32:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mo27T-0006cH-P2 for qemu-devel@nongnu.org; Wed, 16 Sep 2009 17:32:59 -0400 Received: from [199.232.76.173] (port=58002 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo27T-0006bo-FB for qemu-devel@nongnu.org; Wed, 16 Sep 2009 17:32:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46898) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mo27S-0002i3-4y for qemu-devel@nongnu.org; Wed, 16 Sep 2009 17:32:55 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8GLWr0w023142 for ; Wed, 16 Sep 2009 17:32:53 -0400 Received: from localhost (vpn-12-10.rdu.redhat.com [10.11.12.10]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8GLWo8x001000 for ; Wed, 16 Sep 2009 17:32:51 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 16 Sep 2009 18:32:34 -0300 Message-Id: <1253136760-3614-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1253136760-3614-1-git-send-email-lcapitulino@redhat.com> References: <1253136760-3614-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/7] monitor: Add user_print() to mon_cmd_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This new struct member will store a pointer to a function that should be used to output data in the user protocol format. It will also serve as a flag to say if a given handler has already been converted to the new QObject style. Additionally, this commit converts mon_cmd_t static initializations to the C99 way. Signed-off-by: Luiz Capitulino --- monitor.c | 349 +++++++++++++++++++++++++------ qemu-monitor.hx | 615 ++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 774 insertions(+), 190 deletions(-) diff --git a/monitor.c b/monitor.c index 18bcc92..fe604d8 100644 --- a/monitor.c +++ b/monitor.c @@ -71,6 +71,7 @@ typedef struct mon_cmd_t { const char *name; const char *args_type; void *handler; + void (*user_print)(Monitor *mon, const QObject *data); const char *params; const char *help; } mon_cmd_t; @@ -1809,82 +1810,294 @@ static const mon_cmd_t mon_cmds[] = { /* Please update qemu-monitor.hx when adding or changing commands */ static const mon_cmd_t info_cmds[] = { - { "version", "", do_info_version, - "", "show the version of QEMU" }, - { "network", "", do_info_network, - "", "show the network state" }, - { "chardev", "", qemu_chr_info, - "", "show the character devices" }, - { "block", "", bdrv_info, - "", "show the block devices" }, - { "blockstats", "", bdrv_info_stats, - "", "show block device statistics" }, - { "registers", "", do_info_registers, - "", "show the cpu registers" }, - { "cpus", "", do_info_cpus, - "", "show infos for each CPU" }, - { "history", "", do_info_history, - "", "show the command line history", }, - { "irq", "", irq_info, - "", "show the interrupts statistics (if available)", }, - { "pic", "", pic_info, - "", "show i8259 (PIC) state", }, - { "pci", "", pci_info, - "", "show PCI info", }, + { + .name = "version", + .args_type = "", + .handler = do_info_version, + .user_print = NULL, + .params = "", + .help = "show the version of QEMU" + }, + { + .name = "network", + .args_type = "", + .handler = do_info_network, + .user_print = NULL, + .params = "", + .help = "show the network state" + }, + { + .name = "chardev", + .args_type = "", + .handler = qemu_chr_info, + .user_print = NULL, + .params = "", + .help = "show the character devices" + }, + { + .name = "block", + .args_type = "", + .handler = bdrv_info, + .user_print = NULL, + .params = "", + .help = "show the block devices" + }, + { + .name = "blockstats", + .args_type = "", + .handler = bdrv_info_stats, + .user_print = NULL, + .params = "", + .help = "show block device statistics" + }, + { + .name = "registers", + .args_type = "", + .handler = do_info_registers, + .user_print = NULL, + .params = "", + .help = "show the cpu registers" + }, + { + .name = "cpus", + .args_type = "", + .handler = do_info_cpus, + .user_print = NULL, + .params = "", + .help = "show infos for each CPU" + }, + { + .name = "history", + .args_type = "", + .handler = do_info_history, + .user_print = NULL, + .params = "", + .help = "show the command line history" + }, + { + .name = "irq", + .args_type = "", + .handler = irq_info, + .user_print = NULL, + .params = "", + .help = "show the interrupts statistics (if available)" + }, + { + .name = "pic", + .args_type = "", + .handler = pic_info, + .user_print = NULL, + .params = "", + .help = "show i8259 (PIC) state" + }, + { + .name = "pci", + .args_type = "", + .handler = pci_info, + .user_print = NULL, + .params = "", + .help = "show PCI info" + }, #if defined(TARGET_I386) || defined(TARGET_SH4) - { "tlb", "", tlb_info, - "", "show virtual to physical memory mappings", }, + { + .name = "tlb", + .args_type = "", + .handler = tlb_info, + .user_print = NULL, + .params = "", + .help = "show virtual to physical memory mappings" + }, #endif #if defined(TARGET_I386) - { "mem", "", mem_info, - "", "show the active virtual memory mappings", }, - { "hpet", "", do_info_hpet, - "", "show state of HPET", }, + { + .name = "mem", + .args_type = "", + .handler = mem_info, + .user_print = NULL, + .params = "", + .help = "show the active virtual memory mappings" + }, + { + .name = "hpet", + .args_type = "", + .handler = do_info_hpet, + .user_print = NULL, + .params = "", + .help = "show state of HPET" + }, #endif - { "jit", "", do_info_jit, - "", "show dynamic compiler info", }, - { "kvm", "", do_info_kvm, - "", "show KVM information", }, - { "numa", "", do_info_numa, - "", "show NUMA information", }, - { "usb", "", usb_info, - "", "show guest USB devices", }, - { "usbhost", "", usb_host_info, - "", "show host USB devices", }, - { "profile", "", do_info_profile, - "", "show profiling information", }, - { "capture", "", do_info_capture, - "", "show capture information" }, - { "snapshots", "", do_info_snapshots, - "", "show the currently saved VM snapshots" }, - { "status", "", do_info_status, - "", "show the current VM status (running|paused)" }, - { "pcmcia", "", pcmcia_info, - "", "show guest PCMCIA status" }, - { "mice", "", do_info_mice, - "", "show which guest mouse is receiving events" }, - { "vnc", "", do_info_vnc, - "", "show the vnc server status"}, - { "name", "", do_info_name, - "", "show the current VM name" }, - { "uuid", "", do_info_uuid, - "", "show the current VM UUID" }, + { + .name = "jit", + .args_type = "", + .handler = do_info_jit, + .user_print = NULL, + .params = "", + .help = "show dynamic compiler info" + }, + { + .name = "kvm", + .args_type = "", + .handler = do_info_kvm, + .user_print = NULL, + .params = "", + .help = "show KVM information" + }, + { + .name = "numa", + .args_type = "", + .handler = do_info_numa, + .user_print = NULL, + .params = "", + .help = "show NUMA information" + }, + { + .name = "usb", + .args_type = "", + .handler = usb_info, + .user_print = NULL, + .params = "", + .help = "show guest USB devices" + }, + { + .name = "usbhost", + .args_type = "", + .handler = usb_host_info, + .user_print = NULL, + .params = "", + .help = "show host USB devices" + }, + { + .name = "profile", + .args_type = "", + .handler = do_info_profile, + .user_print = NULL, + .params = "", + .help = "show profiling information" + }, + { + .name = "capture", + .args_type = "", + .handler = do_info_capture, + .user_print = NULL, + .params = "", + .help = "show capture information" + }, + { + .name = "snapshots", + .args_type = "", + .handler = do_info_snapshots, + .user_print = NULL, + .params = "", + .help = "show the currently saved VM snapshots" + }, + { + .name = "status", + .args_type = "", + .handler = do_info_status, + .user_print = NULL, + .params = "", + .help = "show the current VM status (running|paused)" + }, + { + .name = "pcmcia", + .args_type = "", + .handler = pcmcia_info, + .user_print = NULL, + .params = "", + .help = "show guest PCMCIA status" + }, + { + .name = "mice", + .args_type = "", + .handler = do_info_mice, + .user_print = NULL, + .params = "", + .help = "show which guest mouse is receiving events" + }, + { + .name = "vnc", + .args_type = "", + .handler = do_info_vnc, + .user_print = NULL, + .params = "", + .help = "show the vnc server status" + }, + { + .name = "name", + .args_type = "", + .handler = do_info_name, + .user_print = NULL, + .params = "", + .help = "show the current VM name" + }, + { + .name = "uuid", + .args_type = "", + .handler = do_info_uuid, + .user_print = NULL, + .params = "", + .help = "show the current VM UUID" + }, #if defined(TARGET_PPC) - { "cpustats", "", do_info_cpu_stats, - "", "show CPU statistics", }, + { + .name = "cpustats", + .args_type = "", + .handler = do_info_cpu_stats, + .user_print = NULL, + .params = "", + .help = "show CPU statistics" + }, #endif #if defined(CONFIG_SLIRP) - { "usernet", "", do_info_usernet, - "", "show user network stack connection states", }, + { + .name = "usernet", + .args_type = "", + .handler = do_info_usernet, + .user_print = NULL, + .params = "", + .help = "show user network stack connection states" + }, #endif - { "migrate", "", do_info_migrate, "", "show migration status" }, - { "balloon", "", do_info_balloon, - "", "show balloon information" }, - { "qtree", "", do_info_qtree, - "", "show device tree" }, - { "qdm", "", do_info_qdm, - "", "show qdev device model list" }, - { NULL, NULL, }, + { + .name = "migrate", + .args_type = "", + .handler = do_info_migrate, + .user_print = NULL, + .params = "", + .help = "show migration status" + }, + { + .name = "balloon", + .args_type = "", + .handler = do_info_balloon, + .user_print = NULL, + .params = "", + .help = "show balloon information" + }, + { + .name = "qtree", + .args_type = "", + .handler = do_info_qtree, + .user_print = NULL, + .params = "", + .help = "show device tree" + }, + { + .name = "qdm", + .args_type = "", + .handler = do_info_qdm, + .user_print = NULL, + .params = "", + .help = "show qdev device model list" + }, + { + .name = NULL, + .args_type = NULL, + .handler = NULL, + .user_print = NULL, + .params = NULL, + .help = NULL + }, }; /*******************************************************************/ diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 9f91873..400d2bd 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -9,21 +9,41 @@ STEXI @table @option ETEXI - { "help|?", "name:s?", do_help_cmd, "[cmd]", "show the help" }, + { + .name = "help|?", + .args_type = "name:s?", + .handler = do_help_cmd, + .user_print = NULL, + .params = "[cmd]", + .help = "show the help" + }, + STEXI @item help or ? [@var{cmd}] Show the help for all commands or just for command @var{cmd}. ETEXI - { "commit", "device:s", do_commit, - "device|all", "commit changes to the disk images (if -snapshot is used) or backing files" }, + { + .name = "commit", + .args_type = "device:s", + .handler = do_commit, + .user_print = NULL, + .params = "device|all", + .help = "commit changes to the disk images (if -snapshot is used) or backing files" + }, STEXI @item commit Commit changes to the disk images (if -snapshot is used) or backing files. ETEXI - { "info", "item:s?", do_info, - "[subcommand]", "show various information about the system state" }, + { + .name = "info", + .args_type = "item:s?", + .handler = do_info, + .user_print = NULL, + .params = "[subcommand]", + .help = "show various information about the system state" + }, STEXI @item info @var{subcommand} Show various information about the system state. @@ -94,22 +114,40 @@ show device tree @end table ETEXI - { "q|quit", "", do_quit, - "", "quit the emulator" }, + { + .name = "q|quit", + .args_type = "", + .handler = do_quit, + .user_print = NULL, + .params = "", + .help = "quit the emulator" + }, STEXI @item q or quit Quit the emulator. ETEXI - { "eject", "force:-f,filename:B", do_eject, - "[-f] device", "eject a removable medium (use -f to force it)" }, + { + .name = "eject", + .args_type = "force:-f,filename:B", + .handler = do_eject, + .user_print = NULL, + .params = "[-f] device", + .help = "eject a removable medium (use -f to force it)" + }, STEXI @item eject [-f] @var{device} Eject a removable medium (use -f to force it). ETEXI - { "change", "device:B,target:F,arg:s?", do_change, - "device filename [format]", "change a removable medium, optional format" }, + { + .name = "change", + .args_type = "device:B,target:F,arg:s?", + .handler = do_change, + .user_print = NULL, + .params = "device filename [format]", + .help = "change a removable medium, optional format" + }, STEXI @item change @var{device} @var{setting} @@ -147,29 +185,53 @@ Password: ******** @end table ETEXI - { "screendump", "filename:F", do_screen_dump, - "filename", "save screen into PPM image 'filename'" }, + { + .name = "screendump", + .args_type = "filename:F", + .handler = do_screen_dump, + .user_print = NULL, + .params = "filename", + .help = "save screen into PPM image 'filename'" + }, STEXI @item screendump @var{filename} Save screen into PPM image @var{filename}. ETEXI - { "logfile", "filename:F", do_logfile, - "filename", "output logs to 'filename'" }, + { + .name = "logfile", + .args_type = "filename:F", + .handler = do_logfile, + .user_print = NULL, + .params = "filename", + .help = "output logs to 'filename'" + }, STEXI @item logfile @var{filename} Output logs to @var{filename}. ETEXI - { "log", "items:s", do_log, - "item1[,...]", "activate logging of the specified items to '/tmp/qemu.log'" }, + { + .name = "log", + .args_type = "items:s", + .handler = do_log, + .user_print = NULL, + .params = "item1[,...]", + .help = "activate logging of the specified items to '/tmp/qemu.log'" + }, STEXI @item log @var{item1}[,...] Activate logging of the specified items to @file{/tmp/qemu.log}. ETEXI - { "savevm", "name:s?", do_savevm, - "[tag|id]", "save a VM snapshot. If no tag or id are provided, a new snapshot is created" }, + { + .name = "savevm", + .args_type = "name:s?", + .handler = do_savevm, + .user_print = NULL, + .params = "[tag|id]", + .help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created" + }, STEXI @item savevm [@var{tag}|@var{id}] Create a snapshot of the whole virtual machine. If @var{tag} is @@ -178,59 +240,107 @@ a snapshot with the same tag or ID, it is replaced. More info at @ref{vm_snapshots}. ETEXI - { "loadvm", "name:s", do_loadvm, - "tag|id", "restore a VM snapshot from its tag or id" }, + { + .name = "loadvm", + .args_type = "name:s", + .handler = do_loadvm, + .user_print = NULL, + .params = "tag|id", + .help = "restore a VM snapshot from its tag or id" + }, STEXI @item loadvm @var{tag}|@var{id} Set the whole virtual machine to the snapshot identified by the tag @var{tag} or the unique snapshot ID @var{id}. ETEXI - { "delvm", "name:s", do_delvm, - "tag|id", "delete a VM snapshot from its tag or id" }, + { + .name = "delvm", + .args_type = "name:s", + .handler = do_delvm, + .user_print = NULL, + .params = "tag|id", + .help = "delete a VM snapshot from its tag or id" + }, STEXI @item delvm @var{tag}|@var{id} Delete the snapshot identified by @var{tag} or @var{id}. ETEXI - { "singlestep", "option:s?", do_singlestep, - "[on|off]", "run emulation in singlestep mode or switch to normal mode", }, + { + .name = "singlestep", + .args_type = "option:s?", + .handler = do_singlestep, + .user_print = NULL, + .params = "[on|off]", + .help = "run emulation in singlestep mode or switch to normal mode", + }, STEXI @item singlestep [off] Run the emulation in single step mode. If called with option off, the emulation returns to normal mode. ETEXI - { "stop", "", do_stop, - "", "stop emulation", }, + { + .name = "stop", + .args_type = "", + .handler = do_stop, + .user_print = NULL, + .params = "", + .help = "stop emulation", + }, STEXI @item stop Stop emulation. ETEXI - { "c|cont", "", do_cont, - "", "resume emulation", }, + { + .name = "c|cont", + .args_type = "", + .handler = do_cont, + .user_print = NULL, + .params = "", + .help = "resume emulation", + }, STEXI @item c or cont Resume emulation. ETEXI - { "gdbserver", "device:s?", do_gdbserver, - "[device]", "start gdbserver on given device (default 'tcp::1234'), stop with 'none'", }, + { + .name = "gdbserver", + .args_type = "device:s?", + .handler = do_gdbserver, + .user_print = NULL, + .params = "[device]", + .help = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'", + }, STEXI @item gdbserver [@var{port}] Start gdbserver session (default @var{port}=1234) ETEXI - { "x", "fmt:/,addr:l", do_memory_dump, - "/fmt addr", "virtual memory dump starting at 'addr'", }, + { + .name = "x", + .args_type = "fmt:/,addr:l", + .handler = do_memory_dump, + .handler = NULL, + .params = "/fmt addr", + .help = "virtual memory dump starting at 'addr'", + }, STEXI @item x/fmt @var{addr} Virtual memory dump starting at @var{addr}. ETEXI - { "xp", "fmt:/,addr:l", do_physical_memory_dump, - "/fmt addr", "physical memory dump starting at 'addr'", }, + { + .name = "xp", + .args_type = "fmt:/,addr:l", + .handler = do_physical_memory_dump, + .user_print = NULL, + .params = "/fmt addr", + .help = "physical memory dump starting at 'addr'", + }, STEXI @item xp /@var{fmt} @var{addr} Physical memory dump starting at @var{addr}. @@ -289,8 +399,14 @@ Dump 80 16 bit values at the start of the video memory. @end itemize ETEXI - { "p|print", "fmt:/,val:l", do_print, - "/fmt expr", "print expression value (use $reg for CPU register access)", }, + { + .name = "p|print", + .args_type = "fmt:/,val:l", + .handler = do_print, + .user_print = NULL, + .params = "/fmt expr", + .help = "print expression value (use $reg for CPU register access)", + }, STEXI @item p or print/@var{fmt} @var{expr} @@ -298,20 +414,38 @@ Print expression value. Only the @var{format} part of @var{fmt} is used. ETEXI - { "i", "fmt:/,addr:i,index:i.", do_ioport_read, - "/fmt addr", "I/O port read" }, + { + .name = "i", + .args_type = "fmt:/,addr:i,index:i.", + .handler = do_ioport_read, + .user_print = NULL, + .params = "/fmt addr", + .help = "I/O port read" + }, STEXI Read I/O port. ETEXI - { "o", "fmt:/,addr:i,val:i", do_ioport_write, - "/fmt addr value", "I/O port write" }, + { + .name = "o", + .args_type = "fmt:/,addr:i,val:i", + .handler = do_ioport_write, + .user_print = NULL, + .params = "/fmt addr value", + .help = "I/O port write" + }, STEXI Write to I/O port. ETEXI - { "sendkey", "string:s,hold_time:i?", do_sendkey, - "keys [hold_ms]", "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)" }, + { + .name = "sendkey", + .args_type = "string:s,hold_time:i?", + .handler = do_sendkey, + .user_print = NULL, + .params = "keys [hold_ms]", + .help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)" + }, STEXI @item sendkey @var{keys} @@ -326,32 +460,56 @@ This command is useful to send keys that your graphical user interface intercepts at low level, such as @code{ctrl-alt-f1} in X Window. ETEXI - { "system_reset", "", do_system_reset, - "", "reset the system" }, + { + .name = "system_reset", + .args_type = "", + .handler = do_system_reset, + .user_print = NULL, + .params = "", + .help = "reset the system" + }, STEXI @item system_reset Reset the system. ETEXI - { "system_powerdown", "", do_system_powerdown, - "", "send system power down event" }, + { + .name = "system_powerdown", + .args_type = "", + .handler = do_system_powerdown, + .user_print = NULL, + .params = "", + .help = "send system power down event" + }, STEXI @item system_powerdown Power down the system (if supported). ETEXI - { "sum", "start:i,size:i", do_sum, - "addr size", "compute the checksum of a memory region" }, + { + .name = "sum", + .args_type = "start:i,size:i", + .handler = do_sum, + .user_print = NULL, + .params = "addr size", + .help = "compute the checksum of a memory region" + }, STEXI @item sum @var{addr} @var{size} Compute the checksum of a memory region. ETEXI - { "usb_add", "devname:s", do_usb_add, - "device", "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')" }, + { + .name = "usb_add", + .args_type = "devname:s", + .handler = do_usb_add, + .user_print = NULL, + .params = "device", + .help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')" + }, STEXI @item usb_add @var{devname} @@ -359,8 +517,14 @@ Add the USB device @var{devname}. For details of available devices see @ref{usb_devices} ETEXI - { "usb_del", "devname:s", do_usb_del, - "device", "remove USB device 'bus.addr'" }, + { + .name = "usb_del", + .args_type = "devname:s", + .handler = do_usb_del, + .user_print = NULL, + .params = "device", + .help = "remove USB device 'bus.addr'" + }, STEXI @item usb_del @var{devname} @@ -369,29 +533,53 @@ hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor command @code{info usb} to see the devices you can remove. ETEXI - { "cpu", "index:i", do_cpu_set, - "index", "set the default CPU" }, + { + .name = "cpu", + .args_type = "index:i", + .handler = do_cpu_set, + .user_print = NULL, + .params = "index", + .help = "set the default CPU" + }, STEXI Set the default CPU. ETEXI - { "mouse_move", "dx_str:s,dy_str:s,dz_str:s?", do_mouse_move, - "dx dy [dz]", "send mouse move events" }, + { + .name = "mouse_move", + .args_type = "dx_str:s,dy_str:s,dz_str:s?", + .handler = do_mouse_move, + .user_print = NULL, + .params = "dx dy [dz]", + .help = "send mouse move events" + }, STEXI @item mouse_move @var{dx} @var{dy} [@var{dz}] Move the active mouse to the specified coordinates @var{dx} @var{dy} with optional scroll axis @var{dz}. ETEXI - { "mouse_button", "button_state:i", do_mouse_button, - "state", "change mouse button state (1=L, 2=M, 4=R)" }, + { + .name = "mouse_button", + .args_type = "button_state:i", + .handler = do_mouse_button, + .user_print = NULL, + .params = "state", + .help = "change mouse button state (1=L, 2=M, 4=R)" + }, STEXI @item mouse_button @var{val} Change the active mouse button state @var{val} (1=L, 2=M, 4=R). ETEXI - { "mouse_set", "index:i", do_mouse_set, - "index", "set which mouse device receives events" }, + { + .name = "mouse_set", + .args_type = "index:i", + .handler = do_mouse_set, + .user_print = NULL, + .params = "index", + .help = "set which mouse device receives events" + }, STEXI @item mouse_set @var{index} Set which mouse device receives events at given @var{index}, index @@ -402,9 +590,13 @@ info mice ETEXI #ifdef HAS_AUDIO - { "wavcapture", "path:s,freq:i?,bits:i?,nchannels:i?", do_wav_capture, - "path [frequency [bits [channels]]]", - "capture audio to a wave file (default frequency=44100 bits=16 channels=2)" }, + { + .name = "wavcapture", + .args_type = "path:s,freq:i?,bits:i?,nchannels:i?", + .handler = do_wav_capture, + .user_print = NULL, + .params = "path [frequency [bits [channels]]]", + .help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)" }, #endif STEXI @item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]] @@ -420,8 +612,14 @@ Defaults: ETEXI #ifdef HAS_AUDIO - { "stopcapture", "n:i", do_stop_capture, - "capture index", "stop capture" }, + { + .name = "stopcapture", + .args_type = "n:i", + .handler = do_stop_capture, + .user_print = NULL, + .params = "capture index", + .help = "stop capture" + }, #endif STEXI @item stopcapture @var{index} @@ -431,22 +629,40 @@ info capture @end example ETEXI - { "memsave", "val:l,size:i,filename:s", do_memory_save, - "addr size file", "save to disk virtual memory dump starting at 'addr' of size 'size'", }, + { + .name = "memsave", + .args_type = "val:l,size:i,filename:s", + .handler = do_memory_save, + .user_print = NULL, + .params = "addr size file", + .help = "save to disk virtual memory dump starting at 'addr' of size 'size'", + }, STEXI @item memsave @var{addr} @var{size} @var{file} save to disk virtual memory dump starting at @var{addr} of size @var{size}. ETEXI - { "pmemsave", "val:l,size:i,filename:s", do_physical_memory_save, - "addr size file", "save to disk physical memory dump starting at 'addr' of size 'size'", }, + { + .name = "pmemsave", + .args_type = "val:l,size:i,filename:s", + .handler = do_physical_memory_save, + .user_print = NULL, + .params = "addr size file", + .help = "save to disk physical memory dump starting at 'addr' of size 'size'", + }, STEXI @item pmemsave @var{addr} @var{size} @var{file} save to disk physical memory dump starting at @var{addr} of size @var{size}. ETEXI - { "boot_set", "bootdevice:s", do_boot_set, - "bootdevice", "define new values for the boot device list" }, + { + .name = "boot_set", + .args_type = "bootdevice:s", + .handler = do_boot_set, + .user_print = NULL, + .params = "bootdevice", + .help = "define new values for the boot device list" + }, STEXI @item boot_set @var{bootdevicelist} @@ -458,37 +674,67 @@ the same that can be specified in the @code{-boot} command line option. ETEXI #if defined(TARGET_I386) - { "nmi", "cpu_index:i", do_inject_nmi, - "cpu", "inject an NMI on the given CPU", }, + { + .name = "nmi", + .args_type = "cpu_index:i", + .handler = do_inject_nmi, + .user_print = NULL, + .params = "cpu", + .help = "inject an NMI on the given CPU" + }, #endif STEXI @item nmi @var{cpu} Inject an NMI on the given CPU (x86 only). ETEXI - { "migrate", "detach:-d,uri:s", do_migrate, - "[-d] uri", "migrate to URI (using -d to not wait for completion)" }, + { + .name = "migrate", + .args_type = "detach:-d,uri:s", + .handler = do_migrate, + .user_print = NULL, + .params = "[-d] uri", + .help = "migrate to URI (using -d to not wait for completion)" + }, STEXI @item migrate [-d] @var{uri} Migrate to @var{uri} (using -d to not wait for completion). ETEXI - { "migrate_cancel", "", do_migrate_cancel, - "", "cancel the current VM migration" }, + { + .name = "migrate_cancel", + .args_type = "", + .handler = do_migrate_cancel, + .user_print = NULL, + .params = "", + .help = "cancel the current VM migration" + }, STEXI @item migrate_cancel Cancel the current VM migration. ETEXI - { "migrate_set_speed", "value:s", do_migrate_set_speed, - "value", "set maximum speed (in bytes) for migrations" }, + { + .name = "migrate_set_speed", + .args_type = "value:s", + .handler = do_migrate_set_speed, + .user_print = NULL, + .params = "value", + .help = "set maximum speed (in bytes) for migrations" + }, STEXI @item migrate_set_speed @var{value} Set maximum speed to @var{value} (in bytes) for migrations. ETEXI - { "migrate_set_downtime", "value:s", do_migrate_set_downtime, - "value", "set maximum tolerated downtime (in seconds) for migrations" }, + { + .name = "migrate_set_downtime", + .args_type = "value:s", + .handler = do_migrate_set_downtime, + .user_print = NULL, + .params = "value", + .help = "set maximum tolerated downtime (in seconds) for migrations" + }, STEXI @item migrate_set_downtime @var{second} @@ -496,85 +742,159 @@ Set maximum tolerated downtime (in seconds) for migration. ETEXI #if defined(TARGET_I386) - { "drive_add", "pci_addr:s,opts:s", drive_hot_add, - "[[:]:]\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]", - "add drive to PCI storage controller" }, + { + .name = "drive_add", + .args_type = "pci_addr:s,opts:s", + .handler = drive_hot_add, + .user_print = NULL, + .params = "[[:]:]\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]", + .help = "add drive to PCI storage controller" + }, #endif + STEXI @item drive_add Add drive to PCI storage controller. ETEXI #if defined(TARGET_I386) - { "pci_add", "pci_addr:s,type:s,opts:s?", pci_device_hot_add, "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, + { + .name = "pci_add", + .args_type = "pci_addr:s,type:s,opts:s?", + .handler = pci_device_hot_add, + .user_print = NULL, + .params = "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", + .help = "hot-add PCI device" + }, #endif + STEXI @item pci_add Hot-add PCI device. ETEXI #if defined(TARGET_I386) - { "pci_del", "pci_addr:s", do_pci_device_hot_remove, "[[:]:]", "hot remove PCI device" }, + { + .name = "pci_del", + .args_type = "pci_addr:s", + .handler = do_pci_device_hot_remove, + .user_print = NULL, + .params = "[[:]:]", + .help = "hot remove PCI device" + }, #endif + STEXI @item pci_del Hot remove PCI device. ETEXI - { "host_net_add", "device:s,opts:s?", net_host_device_add, - "tap|user|socket|vde|dump [options]", "add host VLAN client" }, + { + .name = "host_net_add", + .args_type = "device:s,opts:s?", + .handler = net_host_device_add, + .user_print = NULL, + .params = "tap|user|socket|vde|dump [options]", + .help = "add host VLAN client" + }, STEXI @item host_net_add Add host VLAN client. ETEXI - { "host_net_remove", "vlan_id:i,device:s", net_host_device_remove, - "vlan_id name", "remove host VLAN client" }, + { + .name = "host_net_remove", + .args_type = "vlan_id:i,device:s", + .handler = net_host_device_remove, + .user_print = NULL, + .params = "vlan_id name", + .help = "remove host VLAN client" + }, + STEXI @item host_net_remove Remove host VLAN client. ETEXI #ifdef CONFIG_SLIRP - { "hostfwd_add", "arg1:s,arg2:s?,arg3:s?", net_slirp_hostfwd_add, - "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport", - "redirect TCP or UDP connections from host to guest (requires -net user)" }, - { "hostfwd_remove", "arg1:s,arg2:s?,arg3:s?", net_slirp_hostfwd_remove, - "[vlan_id name] [tcp|udp]:[hostaddr]:hostport", - "remove host-to-guest TCP or UDP redirection" }, + { + .name = "hostfwd_add", + .args_type = "arg1:s,arg2:s?,arg3:s?", + .handler = net_slirp_hostfwd_add, + .user_print = NULL, + .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport", + .help = "redirect TCP or UDP connections from host to guest (requires -net user)" }, + + { + .name = "hostfwd_remove", + .args_type = "arg1:s,arg2:s?,arg3:s?", + .handler = net_slirp_hostfwd_remove, + .user_print = NULL, + .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport", + .help = "remove host-to-guest TCP or UDP redirection" + }, + #endif STEXI @item host_net_redir Redirect TCP or UDP connections from host to guest (requires -net user). ETEXI - { "balloon", "value:i", do_balloon, - "target", "request VM to change it's memory allocation (in MB)" }, + { + .name = "balloon", + .args_type = "value:i", + .handler = do_balloon, + .user_print = NULL, + .params = "target", + .help = "request VM to change it's memory allocation (in MB)" + }, + STEXI @item balloon @var{value} Request VM to change its memory allocation to @var{value} (in MB). ETEXI - { "set_link", "name:s,up_or_down:s", do_set_link, - "name up|down", "change the link status of a network adapter" }, + { + .name = "set_link", + .args_type = "name:s,up_or_down:s", + .handler = do_set_link, + .user_print = NULL, + .params = "name up|down", + .help = "change the link status of a network adapter" + }, + STEXI @item set_link @var{name} [up|down] Set link @var{name} up or down. ETEXI - { "watchdog_action", "action:s", do_watchdog_action, - "[reset|shutdown|poweroff|pause|debug|none]", "change watchdog action" }, + { + .name = "watchdog_action", + .args_type = "action:s", + .handler = do_watchdog_action, + .user_print = NULL, + .params = "[reset|shutdown|poweroff|pause|debug|none]", + .help = "change watchdog action" + }, + STEXI @item watchdog_action Change watchdog action. ETEXI - { "acl_show", "aclname:s", do_acl_show, "aclname", - "list rules in the access control list" }, + { + .name = "acl_show", + .args_type = "aclname:s", + .handler = do_acl_show, + .user_print = NULL, + .params = "aclname", + .help = "list rules in the access control list" + }, + STEXI @item acl_show @var{aclname} List all the matching rules in the access control list, and the default @@ -583,8 +903,15 @@ policy. There are currently two named access control lists, certificate distinguished name, and SASL username respectively. ETEXI - { "acl_policy", "aclname:s,policy:s", do_acl_policy, "aclname allow|deny", - "set default access control list policy" }, + { + .name = "acl_policy", + .args_type = "aclname:s,policy:s", + .handler = do_acl_policy, + .user_print = NULL, + .params = "aclname allow|deny", + .help = "set default access control list policy" + }, + STEXI @item acl_policy @var{aclname} @code{allow|deny} Set the default access control list policy, used in the event that @@ -592,8 +919,15 @@ none of the explicit rules match. The default policy at startup is always @code{deny}. ETEXI - { "acl_add", "aclname:s,match:s,policy:s,index:i?", do_acl_add, "aclname match allow|deny [index]", - "add a match rule to the access control list" }, + { + .name = "acl_add", + .args_type = "aclname:s,match:s,policy:s,index:i?", + .handler = do_acl_add, + .user_print = NULL, + .params = "aclname match allow|deny [index]", + .help = "add a match rule to the access control list" + }, + STEXI @item acl_allow @var{aclname} @var{match} @code{allow|deny} [@var{index}] Add a match rule to the access control list, allowing or denying access. @@ -604,15 +938,29 @@ normally be appended to the end of the ACL, but can be inserted earlier in the list if the optional @var{index} parameter is supplied. ETEXI - { "acl_remove", "aclname:s,match:s", do_acl_remove, "aclname match", - "remove a match rule from the access control list" }, + { + .name = "acl_remove", + .args_type = "aclname:s,match:s", + .handler = do_acl_remove, + .user_print = NULL, + .params = "aclname match", + .help = "remove a match rule from the access control list" + }, + STEXI @item acl_remove @var{aclname} @var{match} Remove the specified match rule from the access control list. ETEXI - { "acl_reset", "aclname:s", do_acl_reset, "aclname", - "reset the access control list" }, + { + .name = "acl_reset", + .args_type = "aclname:s", + .handler = do_acl_reset, + .user_print = NULL, + .params = "aclname", + .help = "reset the access control list" + }, + STEXI @item acl_remove @var{aclname} @var{match} Remove all matches from the access control list, and set the default @@ -620,15 +968,31 @@ policy back to @code{deny}. ETEXI #if defined(TARGET_I386) - { "mce", "cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l", do_inject_mce, "cpu bank status mcgstatus addr misc", "inject a MCE on the given CPU"}, + + { + .name = "mce", + .args_type = "cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l", + .handler = do_inject_mce, + .user_print = NULL, + .params = "cpu bank status mcgstatus addr misc", + .help = "inject a MCE on the given CPU" + }, + #endif STEXI @item mce @var{cpu} @var{bank} @var{status} @var{mcgstatus} @var{addr} @var{misc} Inject an MCE on the given CPU (x86 only). ETEXI - { "getfd", "fdname:s", do_getfd, "getfd name", - "receive a file descriptor via SCM rights and assign it a name" }, + { + .name = "getfd", + .args_type = "fdname:s", + .handler = do_getfd, + .user_print = NULL, + .params = "getfd name", + .help = "receive a file descriptor via SCM rights and assign it a name" + }, + STEXI @item getfd @var{fdname} If a file descriptor is passed alongside this command using the SCM_RIGHTS @@ -636,8 +1000,15 @@ mechanism on unix sockets, it is stored using the name @var{fdname} for later use by other monitor commands. ETEXI - { "closefd", "fdname:s", do_closefd, "closefd name", - "close a file descriptor previously passed via SCM rights" }, + { + .name = "closefd", + .args_type = "fdname:s", + .handler = do_closefd, + .user_print = NULL, + .params = "closefd name", + .help = "close a file descriptor previously passed via SCM rights" + }, + STEXI @item closefd @var{fdname} Close the file descriptor previously assigned to @var{fdname} using the