diff mbox

[1/8] vlan cleanup: update documentation

Message ID 1278962453-15774-2-git-send-email-miguel.filho@gmail.com
State New
Headers show

Commit Message

Miguel Di Ciurcio Filho July 12, 2010, 7:20 p.m. UTC 
---
 qemu-doc.texi |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

Comments

Markus Armbruster July 14, 2010, 6:11 a.m. UTC | #1 
Miguel Di Ciurcio Filho <miguel.filho@gmail.com> writes:

> ---
>  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
[...]
> @@ -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}]

Does this example actually work after you remove VLANs?
diff mbox

Patch

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}]