From patchwork Fri Feb 22 14:57:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 222545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE8142C0296 for ; Sat, 23 Feb 2013 02:07:15 +1100 (EST) Received: from localhost ([::1]:53283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8uDR-0000Dy-SD for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 10:07:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8uDF-0000Cf-9h for qemu-devel@nongnu.org; Fri, 22 Feb 2013 10:07:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8uD5-0001Un-SP for qemu-devel@nongnu.org; Fri, 22 Feb 2013 10:07:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8uD5-0001Ti-Jl; Fri, 22 Feb 2013 10:06:51 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1MF6o2m008315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Feb 2013 10:06:50 -0500 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1MF6iQe026398; Fri, 22 Feb 2013 10:06:45 -0500 From: Jason Wang To: armbru@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Fri, 22 Feb 2013 22:57:52 +0800 Message-Id: <1361545072-30426-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Jason Wang , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH] help: add docs for missing 'queues' option of tap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Cc: Markus Armbruster Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael Roth --- qapi-schema.json | 2 ++ qemu-options.hx | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index cd7ea25..b3844e6 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 2832d82..3928620 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1354,7 +1354,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" @@ -1373,6 +1373,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"