aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2013-02-22 22:57:52 +0800
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-04-05 13:57:17 -0500
commitf85e082a3668dea5ca74759a314e284432f2d46b (patch)
tree89cf36d2c5efcac8a93e816c50a1b8eec6b86779
parentda78a1bc7a6ad2c0653c265a19032540921c15d0 (diff)
help: add docs for missing 'queues' option of tap
Cc: Markus Armbruster <armbru@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang <jasowang@redhat.com> Message-id: 1361545072-30426-1-git-send-email-jasowang@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit ec3960148f95dd90e94511a6a64838bc3f474bcc) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--qapi-schema.json2
-rw-r--r--qemu-options.hx3
2 files changed, 4 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index cd7ea25e4c..b3844e6fef 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2526,6 +2526,8 @@
#
# @vhostforce: #optional vhost on for non-MSIX virtio guests
#
+# @queues: #optional number of queues to be created for multiqueue capable tap
+#
# Since 1.2
##
{ 'type': 'NetdevTapOptions',
diff --git a/qemu-options.hx b/qemu-options.hx
index 14fb84b097..15dc29e3c5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1349,7 +1349,7 @@ 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][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off]\n"
+ "-net tap[,vlan=n][,name=str][,fd=h][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off][,queues=n]\n"
" connect the host TAP network interface to VLAN 'n'\n"
" use network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n"
" to configure it and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
@@ -1368,6 +1368,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
" 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"
" use 'vhostfds=x:y:...:z to connect to multiple already opened vhost net devices\n"
+ " use 'queues=n' to specify the number of queues to be created for multiqueue TAP\n"
"-net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper]\n"
" connects a host TAP network interface to a host bridge device 'br'\n"
" (default=" DEFAULT_BRIDGE_INTERFACE ") using the program 'helper'\n"