From f85e082a3668dea5ca74759a314e284432f2d46b Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Fri, 22 Feb 2013 22:57:52 +0800 Subject: help: add docs for missing 'queues' option of tap Cc: Markus Armbruster Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang Message-id: 1361545072-30426-1-git-send-email-jasowang@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit ec3960148f95dd90e94511a6a64838bc3f474bcc) Signed-off-by: Michael Roth --- qapi-schema.json | 2 ++ qemu-options.hx | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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" -- cgit v1.2.3