[Xen-changelog] Merge.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1608, 2005/05/31 14:19:42+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Merge.



 docs/src/user.tex |   65 +++++++++++++++++++++++++++++++++++++-----------------
 xen/Makefile      |    8 +++---
 2 files changed, 49 insertions(+), 24 deletions(-)


diff -Nru a/docs/src/user.tex b/docs/src/user.tex
--- a/docs/src/user.tex 2005-05-31 12:03:13 -04:00
+++ b/docs/src/user.tex 2005-05-31 12:03:13 -04:00
@@ -491,7 +491,7 @@
 
 The kernel line tells GRUB where to find Xen itself and what boot
 parameters should be passed to it (in this case, setting domain 0's
-memory allocation and the settings for the serial port). For more
+memory allocation in kilobytes and the settings for the serial port). For more
 details on the various Xen boot parameters see Section~\ref{s:xboot}. 
 
 The module line of the configuration describes the location of the
@@ -536,7 +536,7 @@
 \begin{verbatim}
    kernel /boot/xen.gz dom0_mem=131072 com1=115200,8n1
 \end{verbatim}}
-\end{quote} 
+\end{quote}
 
 This configures Xen to output on COM1 at 115,200 baud, 8 data bits, 
 1 stop bit and no parity. Modify these parameters for your set up. 
@@ -1101,7 +1101,7 @@
 To initialise a partition to support LVM volumes:
 \begin{quote}
 \begin{verbatim} 
-# pvcreate /dev/sda10          
+# pvcreate /dev/sda10           
 \end{verbatim} 
 \end{quote}
 
@@ -1680,12 +1680,6 @@
 editing \path{grub.conf}.
 
 \begin{description}
-\item [ignorebiostables ] 
- Disable parsing of BIOS-supplied tables. This may help with some
- chipsets that aren't fully supported by Xen. If you specify this
- option then ACPI tables are also ignored, and SMP support is
- disabled. 
-
 \item [noreboot ] 
  Don't reboot the machine automatically on errors.  This is
  useful to catch debug output if you aren't catching console messages
@@ -1695,10 +1689,6 @@
  Disable SMP support.
  This option is implied by `ignorebiostables'. 
 
-\item [noacpi ] 
- Disable ACPI tables, which confuse Xen on some chipsets.
- This option is implied by `ignorebiostables'. 
-
 \item [watchdog ] 
  Enable NMI watchdog which can report certain failures. 
 
@@ -1756,8 +1746,19 @@
  `nmi=dom0':   Inform DOM0 of the NMI. \\
  `nmi=ignore': Ignore the NMI. 
 
+\item [mem=xxx ]
+ Set the physical RAM address limit. Any RAM appearing beyond this
+ physical address in the memory map will be ignored. This parameter
+ may be specified with a B, K, M or G suffix, representing bytes,
+ kilobytes, megabytes and gigabytes respectively. The
+ default unit, if no suffix is specified, is bytes.
+
 \item [dom0\_mem=xxx ] 
- Set the amount of memory (in kB) to be allocated to domain0.  
+ Set the amount of memory to be allocated to domain0. In Xen 3.x the parameter
+ may be specified with a B, K, M or G suffix, representing bytes,
+ kilobytes, megabytes and gigabytes respectively; if no suffix is specified, 
+ the parameter defaults to kilobytes. In previous versions of Xen, suffixes
+ were not supported and the value is always interpreted as kilobytes. 
 
 \item [tbuf\_size=xxx ] 
  Set the size of the per-cpu trace buffers, in pages
@@ -1770,15 +1771,39 @@
  possibilities are `bvt' (default), `atropos' and `rrobin'. 
  For more information see Section~\ref{s:sched}. 
 
-\item [physdev\_dom0\_hide=(xx:xx.x)(yy:yy.y)\ldots ]
-Hide selected PCI devices from domain 0 (for instance, to stop it
-taking ownership of them so that they can be driven by another
-domain).  Device IDs should be given in hex format.  Bridge devices do
-not need to be hidden --- they are hidden implicitly, since guest OSes
-do not need to configure them.
+\item [apic\_verbosity=debug,verbose ]
+ Print more detailed information about local APIC and IOAPIC configuration.
+
+\item [lapic ]
+ Force use of local APIC even when left disabled by uniprocessor BIOS.
+
+\item [nolapic ]
+ Ignore local APIC in a uniprocessor system, even if enabled by the BIOS.
+
+\item [apic=bigsmp,default,es7000,summit ]
+ Specify NUMA platform. This can usually be probed automatically.
+
 \end{description} 
 
+In addition, the following options may be specified on the Xen command
+line. Since domain 0 shares responsibility for booting the platform,
+Xen will automatically propagate these options to its command
+line. These options are taken from Linux's command-line syntax with
+unchanged semantics.
 
+\begin{description}
+\item [acpi=off,force,strict,ht,noirq,\ldots ] 
+ Modify how Xen (and domain 0) parses the BIOS ACPI tables.
+
+\item [acpi\_skip\_timer\_override ]
+ Instruct Xen (and domain 0) to ignore timer-interrupt override
+ instructions specified by the BIOS ACPI tables.
+
+\item [noapic ]
+ Instruct Xen (and domain 0) to ignore any IOAPICs that are present in
+ the system, and instead continue to use the legacy PIC.
+
+\end{description} 
 
 \section{XenLinux Boot Options}
 
diff -Nru a/xen/Makefile b/xen/Makefile
--- a/xen/Makefile      2005-05-31 12:03:13 -04:00
+++ b/xen/Makefile      2005-05-31 12:03:13 -04:00
@@ -8,9 +8,9 @@
 
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
-export XEN_VERSION       = 2
+export XEN_VERSION       = 3
 export XEN_SUBVERSION    = 0
-export XEN_EXTRAVERSION  = -testing
+export XEN_EXTRAVERSION  = -devel
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 
 export BASEDIR          := $(CURDIR)
@@ -83,9 +83,9 @@
        @mv -f $@.new $@
 
 tools/figlet/figlet: tools/figlet/figlet.o
-       $(CC) -o $@ $<
+       $(HOSTCC) -o $@ $<
 tools/figlet/figlet.o: tools/figlet/figlet.c
-       $(CC) -o $@ -c $<
+       $(HOSTCC) -o $@ -c $<
 
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
        tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) > $@.new

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog