diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-20 13:25:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-20 13:25:28 +0100 |
| commit | f73ca7363440240b7ee5ee7f7ddb1c64751efb54 (patch) | |
| tree | 3a5a63dc82049cff15f105d68617be7d3b2571c1 /qemu-options.hx | |
| parent | 71358470eec668f5dc53def25e585ce250cea9bf (diff) | |
| parent | f9d6dbf0bf6e91b8ed896369ab1b7e91e5a1a4df (diff) | |
| download | focaccia-qemu-f73ca7363440240b7ee5ee7f7ddb1c64751efb54.tar.gz focaccia-qemu-f73ca7363440240b7ee5ee7f7ddb1c64751efb54.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, vhost, pc fixes for 2.4 The only notable thing here is vhost-user multiqueue revert. We'll work on making it stable in 2.5, reverting now means we won't have to maintain bug for bug compability forever. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon Jul 20 12:24:00 2015 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: virtio-net: remove virtio queues if the guest doesn't support multiqueue virtio-net: Flush incoming queues when DRIVER_OK is being set pci_add_capability: remove duplicate comments virtio-net: unbreak any layout Revert "vhost-user: add multi queue support" ich9: fix skipped vmstate_memhp_state subsection Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 7b8efbf03d..8c9add9d25 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1963,14 +1963,13 @@ The hubport netdev lets you connect a NIC to a QEMU "vlan" instead of a single netdev. @code{-net} and @code{-device} with parameter @option{vlan} create the required hub automatically. -@item -netdev vhost-user,chardev=@var{id}[,vhostforce=on|off][,queues=n] +@item -netdev vhost-user,chardev=@var{id}[,vhostforce=on|off] Establish a vhost-user netdev, backed by a chardev @var{id}. The chardev should be a unix domain socket backed one. The vhost-user uses a specifically defined protocol to pass vhost ioctl replacement messages to an application on the other end of the socket. On non-MSIX guests, the feature can be forced with -@var{vhostforce}. Use 'queues=@var{n}' to specify the number of queues to -be created for multiqueue vhost-user. +@var{vhostforce}. Example: @example |