Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-merge

* commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46': (63 commits)
  monitor: do_info_cpus(): Use QBool
  monitor: Fix do_info_commands() output
  monitor: Fix do_info_balloon() output
  QDict: Introduce qdict_get_qlist()
  QDict: Introduce qdict_get_qbool()
  Makefile: move QObject objs to their own entry
  Introduce qemu-objects.h header file
  vnc: fix capslock tracking logic.
  QemuOpts: allow larger option values.
  scsi: fix drive hotplug.
  pci: don't hw_error() when no slot is available.
  pci: don't abort() when trying to hotplug with acpi off.
  Set default console to virtio on S390x
  default devices: virtio consoles.
  add -qmp convinience switch
  add new -mon switch
  rework -monitor handling, switch to QemuOpts
  un-static qemu_chr_parse_compat()
  default devices: drives
  default devices: network
  ...

Conflicts:
	monitor.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 19 insertions, 3 deletions

diff --git a/qemu-options.hx b/qemu-options.hx
index fff751b01..812d0670a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -110,6 +110,9 @@ DEF("set", HAS_ARG, QEMU_OPTION_set,
     "-set group.id.arg=value\n"
     "                set <arg> parameter for item <id> of type <group>\n"
     "                i.e. -set drive.$id.file=/path/to/image\n")
+DEF("global", HAS_ARG, QEMU_OPTION_global,
+    "-global driver.property=value\n"
+    "                set a global default for a driver property\n")
 STEXI
 @item -drive @var{option}[,@var{option}[,@var{option}[,...]]]
 
@@ -1578,14 +1581,22 @@ Use @code{-parallel none} to disable all parallel ports.
 ETEXI
 
 DEF("monitor", HAS_ARG, QEMU_OPTION_monitor, \
-    "-monitor [control,]dev    redirect the monitor to char device 'dev'\n")
+    "-monitor dev    redirect the monitor to char device 'dev'\n")
 STEXI
-@item -monitor [@var{control},]@var{dev}
+@item -monitor @var{dev}
 Redirect the monitor to host device @var{dev} (same devices as the
 serial port).
 The default device is @code{vc} in graphical mode and @code{stdio} in
 non graphical mode.
-The option @var{control} enables the QEMU Monitor Protocol.
+ETEXI
+DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \
+    "-qmp dev        like -monitor but opens in 'control' mode.\n")
+
+DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
+    "-mon chardev=[name][,mode=readline|control][,default]\n")
+STEXI
+@item -mon chardev=[name][,mode=readline|control][,default]
+Setup monitor on chardev @var{name}.
 ETEXI
 
 DEF("pidfile", HAS_ARG, QEMU_OPTION_pidfile, \
@@ -1880,6 +1891,11 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
 STEXI
 ETEXI
 
+DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
+    "-nodefaults     don't create default devices.\n")
+STEXI
+ETEXI
+
 #ifndef _WIN32
 DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \
     "-chroot dir     Chroot to dir just before starting the VM.\n")