From patchwork Mon Jul 12 19:20:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 58660 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2EAB5B6EF2 for ; Tue, 13 Jul 2010 05:25:06 +1000 (EST) Received: from localhost ([127.0.0.1]:56928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOcV-0003UV-JJ for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 15:24:51 -0400 Received: from [140.186.70.92] (port=37496 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOZD-0001aM-U9 for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYOZC-0003rU-Od for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:27 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:44975) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYOZC-0003rP-Ie for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:26 -0400 Received: by gyf2 with SMTP id 2so2918762gyf.4 for ; Mon, 12 Jul 2010 12:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=7W6Qi8kt5ErpToDl2EEhdQAb8rLzZ9U4MvTTxW4TDcU=; b=xKcSO3+/il73tMjOCiodX82ZVVN+biTgXSNydUhIPv4dEfiePooYJeEFjp4IPH9lo9 3FpNXlMGh9zuXL4bW293zrTyZoW0vF6itMIgbA9158u6boGWeh0q5Rtr/1rCrrBcq8gd EeEwR2yvywhlQjAk8WubmW6Bh+eyxk5DvrXgg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=mXUDkXQsRO3xSGL0Mue2Y7ZLORasgYNLaqEQKzEbCeTtNFVod6puDxtwXF+AqKNXDu SmqBB7e1xMgjc46eZ5JBCse5AITMqO+8ozTEyVwVwJuJ1HJOUQe5ilWCY8CRcYifb2K3 rQxXLqEUTb1WdpjFYdEY7g+VlYqITkEtE9FG8= Received: by 10.100.226.13 with SMTP id y13mr15224481ang.263.1278962485318; Mon, 12 Jul 2010 12:21:25 -0700 (PDT) Received: from localhost.localdomain ([143.106.7.130]) by mx.google.com with ESMTPS id p9sm55284904anf.26.2010.07.12.12.21.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 12 Jul 2010 12:21:24 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Mon, 12 Jul 2010 16:20:46 -0300 Message-Id: <1278962453-15774-2-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278962453-15774-1-git-send-email-miguel.filho@gmail.com> References: <1278962453-15774-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Miguel Di Ciurcio Filho , avi@redhat.com Subject: [Qemu-devel] [PATCH 1/8] vlan cleanup: update documentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- qemu-doc.texi | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index e2c8e56..d5bf318 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -624,19 +624,7 @@ qemu linux2.img -hdb nbd:unix:/tmp/my_socket @section Network emulation QEMU can simulate several network cards (PCI or ISA cards on the PC -target) and can connect them to an arbitrary number of Virtual Local -Area Networks (VLANs). Host TAP devices can be connected to any QEMU -VLAN. VLAN can be connected between separate instances of QEMU to -simulate large networks. For simpler usage, a non privileged user mode -network stack can replace the TAP device to have a basic network -connection. - -@subsection VLANs - -QEMU simulates several VLANs. A VLAN can be symbolised as a virtual -connection between several network devices. These devices can be for -example QEMU virtual Ethernet cards or virtual Host ethernet devices -(TAP devices). +target) and can connect them to an arbitrary number of host devices. @subsection Using TAP network interfaces @@ -672,7 +660,7 @@ network). The virtual network configuration is the following: @example - QEMU VLAN <------> Firewall/DHCP server <-----> Internet + QEMU <------> Firewall/DHCP server <-----> Internet | (10.0.2.2) | ----> DNS server (10.0.2.3) @@ -700,12 +688,6 @@ When using the @option{-redir} option, TCP or UDP connections can be redirected from the host to the guest. It allows for example to redirect X11, telnet or SSH connections. -@subsection Connecting VLANs between QEMU instances - -Using the @option{-net socket} option, it is possible to make VLANs -that span several QEMU instances. See @ref{sec_invocation} to have a -basic example. - @node direct_linux_boot @section Direct Linux Boot @@ -794,7 +776,7 @@ Network adapter that supports CDC ethernet and RNDIS protocols. @var{options} specifies NIC options as with @code{-net nic,}@var{options} (see description). For instance, user-mode networking can be used with @example -qemu [...OPTIONS...] -net user,vlan=0 -usbdevice net:vlan=0 +qemu [...OPTIONS...] -net user -usbdevice net @end example Currently this cannot be used in machines that support PCI NICs. @item bt[:@var{hci-type}]