Merge commit 'f487d6278f75f84378833b8c3a67443346d639dc' into upstream-merge

* commit 'f487d6278f75f84378833b8c3a67443346d639dc': (140 commits)
  Update SeaBIOS to 0.6.1.2
  vhost: force vhost off for non-MSI guests
  tap: safe sndbuf default
  Add boot index documentation.
  Add bootindex handling into usb storage device.
  fix QemuOpts leak
  remove text_console_opts
  add set_echo implementation for text consoles
  create TextConsole together with the CharDeviceState
  add set_echo implementation for qemu_chr_stdio
  move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio
  add qemu_chr_set_echo
  remove broken code for tty
  vnc: Fix password expiration through 'change vnc ""' (v2)
  linux-user: avoid gcc array overrun warning for sparc
  hw/slavio_intctl.c: fix gcc warning about array bounds overrun
  SPARC: Fix Leon3 cache control
  blockdev: Fix drive_add for drives without media
  blockdev: Replace drive_add()'s fmt, ... by optstr parameter
  blockdev: Reject multiple definitions for the same drive
  ...

Conflicts:
	roms/seabios

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 19 insertions, 3 deletions

diff --git a/qemu-options.hx b/qemu-options.hx
index d146796ad..328a1f9df 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1052,17 +1052,19 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "-net tap[,vlan=n][,name=str],ifname=name\n"
     "                connect the host TAP network interface to VLAN 'n'\n"
 #else
-    "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h]\n"
+    "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off]\n"
     "                connect the host TAP network interface to VLAN 'n' and use the\n"
     "                network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n"
     "                and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
     "                use '[down]script=no' to disable script execution\n"
     "                use 'fd=h' to connect to an already opened TAP interface\n"
     "                use 'sndbuf=nbytes' to limit the size of the send buffer (the\n"
-    "                default of 'sndbuf=1048576' can be disabled using 'sndbuf=0')\n"
+    "                default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576')\n"
     "                use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n"
     "                use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n"
     "                use vhost=on to enable experimental in kernel accelerator\n"
+    "                    (only has effect for virtio guests which use MSIX)\n"
+    "                use vhostforce=on to force vhost on for non-MSIX virtio guests\n"
     "                use 'vhostfd=h' to connect to an already opened vhost net device\n"
 #endif
     "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n"
@@ -1370,6 +1372,9 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
     "-chardev parport,id=id,path=path[,mux=on|off]\n"
 #endif
+#if defined(CONFIG_SPICE)
+    "-chardev spicevmc,id=id,name=name[,debug=debug]\n"
+#endif
     , QEMU_ARCH_ALL
 )
 
@@ -1394,7 +1399,8 @@ Backend is one of:
 @option{stdio},
 @option{braille},
 @option{tty},
-@option{parport}.
+@option{parport},
+@option{spicevmc}.
 The specific backend will determine the applicable options.
 
 All devices must have an id, which can be any string up to 127 characters long.
@@ -1570,6 +1576,16 @@ Connect to a local parallel port.
 @option{path} specifies the path to the parallel port device. @option{path} is
 required.
 
+#if defined(CONFIG_SPICE)
+@item -chardev spicevmc ,id=@var{id} ,debug=@var{debug}, name=@var{name}
+
+@option{debug} debug level for spicevmc
+
+@option{name} name of spice channel to connect to
+
+Connect to a spice virtual machine channel, such as vdiport.
+#endif
+
 @end table
 ETEXI