ia64/xen-unstable

changeset 2961:aa80863c1eac

bitkeeper revision 1.1159.168.2 (4195d5cd7EdTdzGQTt_b3E_j7MPmUw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk
author cl349@freefall.cl.cam.ac.uk
date Sat Nov 13 09:37:17 2004 +0000 (2004-11-13)
parents 3cf62df5b94b 136b8a6df341
children 85a6dfa5c367
files docs/src/user.tex xen/arch/x86/domain.c xen/common/kernel.c
line diff
     1.1 --- a/docs/src/user.tex	Fri Nov 05 15:44:46 2004 +0000
     1.2 +++ b/docs/src/user.tex	Sat Nov 13 09:37:17 2004 +0000
     1.3 @@ -1345,6 +1345,7 @@ for concrete examples of the syntax.
     1.4  \item[memory] Memory size in megabytes.
     1.5  \item[cpu] CPU to run this domain on, or {\tt -1} for
     1.6    auto-allocation. 
     1.7 +\item[console] Port to export the domain console on (default 9600 + domain ID).
     1.8  \item[nics] Number of virtual network interfaces.
     1.9  \item[vif] List of MAC addresses (random addresses are assigned if not
    1.10    given) and bridges to use for the domain's network interfaces, e.g.
    1.11 @@ -1399,6 +1400,23 @@ special configuration.
    1.12  The purpose of this section is to describe the mechanisms provided by
    1.13  \xend to allow a flexible configuration for Xen's virtual networking.
    1.14  
    1.15 +\subsection{Xen virtual network topology}
    1.16 +
    1.17 +Each domain network interface is connected to a virtual network
    1.18 +interface in dom0 by a point to point link (effectively a `virtual
    1.19 +crossover cable').  These devices are named {\tt
    1.20 +vif$<$domid$>$.$<$vifid$>$} (e.g. {\tt vif1.0} for the first interface
    1.21 +in domain 1, {\tt vif3.1} for the second interface in domain 3).
    1.22 +
    1.23 +Traffic on these virtual interfaces is handled in domain 0 using
    1.24 +standard Linux mechanisms for bridging, routing, rate limiting, etc.
    1.25 +Xend calls on two shell scripts to perform initial configuration of
    1.26 +the network and configuration of new virtual interfaces.  By default,
    1.27 +these scripts configure a single bridge for all the virtual
    1.28 +interfaces.  Arbitrary routing / bridging configurations can be
    1.29 +configured by customising the scripts, as described in the following
    1.30 +section.
    1.31 +
    1.32  \subsection{Xen networking scripts}
    1.33  
    1.34  Xen's virtual networking is configured by two shell scripts (by
    1.35 @@ -1428,6 +1446,9 @@ VIFs on the default Xen bridge.
    1.36  
    1.37  \end{description} 
    1.38  
    1.39 +For more complex network setups (e.g. where routing is required or
    1.40 +integrate with existing bridges) these scripts may be replaced with
    1.41 +customised variants for your site's preferred configuration.
    1.42  
    1.43  %% There are two possible types of privileges:  IO privileges and
    1.44  %% administration privileges.
     2.1 --- a/xen/arch/x86/domain.c	Fri Nov 05 15:44:46 2004 +0000
     2.2 +++ b/xen/arch/x86/domain.c	Sat Nov 13 09:37:17 2004 +0000
     2.3 @@ -895,9 +895,6 @@ int construct_dom0(struct domain *p,
     2.4              l2start[i] = mk_l2_pgentry(0);
     2.5      zap_low_mappings(); /* Do the same for the idle page tables. */
     2.6      
     2.7 -    /* Give up the VGA console if DOM0 is configured to grab it. */
     2.8 -    console_endboot(cmdline && strstr(cmdline, "tty0"));
     2.9 -
    2.10      /* DOM0 gets access to everything. */
    2.11      physdev_init_dom0(p);
    2.12  
     3.1 --- a/xen/common/kernel.c	Fri Nov 05 15:44:46 2004 +0000
     3.2 +++ b/xen/common/kernel.c	Sat Nov 13 09:37:17 2004 +0000
     3.3 @@ -349,6 +349,9 @@ void cmain(multiboot_info_t *mbi)
     3.4  
     3.5      init_trace_bufs();
     3.6  
     3.7 +    /* Give up the VGA console if DOM0 is configured to grab it. */
     3.8 +    console_endboot(cmdline && strstr(cmdline, "tty0"));
     3.9 +
    3.10      domain_unpause_by_systemcontroller(current);
    3.11      domain_unpause_by_systemcontroller(dom0);
    3.12      startup_cpu_idle_loop();