From patchwork Tue Feb 26 10:07:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 223164 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 5158B2C0306 for ; Tue, 26 Feb 2013 21:07:43 +1100 (EST) Received: from localhost ([::1]:55181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAHRl-0006Kt-Cu for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 05:07:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAHRV-0005xM-Dl for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:07:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAHRQ-0007AZ-MF for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:07:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAHRQ-0007AL-DK for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:07:20 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1QA7Jwo022408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 26 Feb 2013 05:07:19 -0500 Received: from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1QA7I5Q006423; Tue, 26 Feb 2013 05:07:19 -0500 From: Stefan Hajnoczi To: Date: Tue, 26 Feb 2013 11:07:16 +0100 Message-Id: <1361873236-30352-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Laszlo Ersek , Markus Armbruster , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v4] doc: document -netdev hubport 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 Signed-off-by: Stefan Hajnoczi Reviewed-by: Markus Armbruster --- hmp-commands.hx | 2 +- qemu-options.hx | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 64008a9..c204d31 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1169,7 +1169,7 @@ ETEXI { .name = "netdev_add", .args_type = "netdev:O", - .params = "[user|tap|socket],id=str[,prop=value][,...]", + .params = "[user|tap|socket|hubport],id=str[,prop=value][,...]", .help = "add host network device", .mhandler.cmd = hmp_netdev_add, }, diff --git a/qemu-options.hx b/qemu-options.hx index 2832d82..c99eea0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1406,7 +1406,8 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #ifdef CONFIG_VDE "vde|" #endif - "socket],id=str[,option][,option][,...]\n", QEMU_ARCH_ALL) + "socket|" + "hubport],id=str[,option][,option][,...]\n", QEMU_ARCH_ALL) STEXI @item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] @findex -net @@ -1728,6 +1729,14 @@ vde_switch -F -sock /tmp/myswitch qemu-system-i386 linux.img -net nic -net vde,sock=/tmp/myswitch @end example +@item -netdev hubport,id=@var{id},hubid=@var{hubid} + +Create a hub port on QEMU "vlan" @var{hubid}. + +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 -net dump[,vlan=@var{n}][,file=@var{file}][,len=@var{len}] Dump network traffic on VLAN @var{n} to file @var{file} (@file{qemu-vlan0.pcap} by default). At most @var{len} bytes (64k by default) per packet are stored. The file format is