ia64/xen-unstable

changeset 2797:0b62fc951ef8

bitkeeper revision 1.1159.142.8 (41856f88s5u8hpX2TlCOupENnBIqig)

merge
author iap10@labyrinth.cl.cam.ac.uk
date Sun Oct 31 23:04:40 2004 +0000 (2004-10-31)
parents 16d622cb873f 30421f550824
children 3f929065a1d1 eaee2f25b189
files .rootkeys BitKeeper/etc/ignore README TODO linux-2.6.9-xen-sparse/arch/xen/Makefile linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/.rootkeys	Sun Oct 31 17:37:47 2004 +0000
     1.2 +++ b/.rootkeys	Sun Oct 31 23:04:40 2004 +0000
     1.3 @@ -5,7 +5,6 @@ 3ddb79c9_hgSp-gsQm8HqWM_9W3B_A BitKeeper
     1.4  4177dbbfqsi01p2zgZa0geUOgScONw COPYING
     1.5  3eb788d6Kleck_Cut0ouGneviGzliQ Makefile
     1.6  3f5ef5a24IaQasQE2tyMxrfxskMmvw README
     1.7 -3f69d8abYB1vMyD_QVDvzxy5Zscf1A TODO
     1.8  3f9e7d53iC47UnlfORp9iC1vai6kWw docs/Makefile
     1.9  3f9e7d60PWZJeVh5xdnk0nLUdxlqEA docs/figs/xenlogo.eps
    1.10  418273f3YZUyGIrNbERVAPFeOd9gww docs/figs/xenserver.obj
     2.1 --- a/BitKeeper/etc/ignore	Sun Oct 31 17:37:47 2004 +0000
     2.2 +++ b/BitKeeper/etc/ignore	Sun Oct 31 23:04:40 2004 +0000
     2.3 @@ -13,44 +13,13 @@ TAGS
     2.4  Twisted-1.3.0
     2.5  Twisted-1.3.0.tar.gz
     2.6  docs/*.aux
     2.7 +docs/*.dvi
     2.8  docs/*.log
     2.9  docs/*.pdf
    2.10  docs/*.ps
    2.11 -docs/*.dvi
    2.12  docs/*.toc
    2.13 +docs/figs/xenserver.eps
    2.14  docs/html/*
    2.15 -extras/mini-os/h/hypervisor-ifs
    2.16 -install
    2.17 -install/*
    2.18 -linux-*-xen0/*
    2.19 -linux-*-xenU/*
    2.20 -linux-xen-sparse
    2.21 -netbsd-*-xen0
    2.22 -netbsd-*-xenU
    2.23 -netbsd-*-tools
    2.24 -patches/*
    2.25 -tools/*/build/lib*/*.py
    2.26 -tools/balloon/balloon
    2.27 -tools/check/.*
    2.28 -tools/libxc/xen
    2.29 -tools/misc/miniterm/miniterm
    2.30 -tools/misc/xen_cpuperf
    2.31 -tools/web-shutdown.tap
    2.32 -tools/xentrace/xentrace
    2.33 -tools/xfrd/xfrd
    2.34 -xen/arch/x86/boot/mkelf32
    2.35 -xen/drivers/pci/classlist.h
    2.36 -xen/drivers/pci/devlist.h
    2.37 -xen/drivers/pci/gen-devlist
    2.38 -xen/figlet/figlet
    2.39 -xen/include/asm
    2.40 -xen/include/hypervisor-ifs/arch
    2.41 -xen/include/xen/compile.h
    2.42 -xen/tools/elf-reloc
    2.43 -xen/tools/figlet/figlet
    2.44 -xen/xen
    2.45 -xen/xen-syms
    2.46 -xen/xen.*
    2.47  docs/interface/WARNINGS
    2.48  docs/interface/images.pl
    2.49  docs/interface/images.tex
    2.50 @@ -79,4 +48,36 @@ docs/xend/internals.pl
    2.51  docs/xend/labels.pl
    2.52  docs/xend/xend.css
    2.53  docs/xend/xend.html
    2.54 -docs/figs/xenserver.eps
    2.55 +extras/mini-os/h/hypervisor-ifs
    2.56 +install
    2.57 +install/*
    2.58 +linux-*-xen0/*
    2.59 +linux-*-xenU/*
    2.60 +linux-xen-sparse
    2.61 +netbsd-*-tools
    2.62 +netbsd-*-xen0
    2.63 +netbsd-*-xenU
    2.64 +patches/*
    2.65 +pristine-*
    2.66 +tools/*/build/lib*/*.py
    2.67 +tools/balloon/balloon
    2.68 +tools/check/.*
    2.69 +tools/libxc/xen
    2.70 +tools/misc/miniterm/miniterm
    2.71 +tools/misc/xen_cpuperf
    2.72 +tools/web-shutdown.tap
    2.73 +tools/xentrace/xentrace
    2.74 +tools/xfrd/xfrd
    2.75 +xen/arch/x86/boot/mkelf32
    2.76 +xen/drivers/pci/classlist.h
    2.77 +xen/drivers/pci/devlist.h
    2.78 +xen/drivers/pci/gen-devlist
    2.79 +xen/figlet/figlet
    2.80 +xen/include/asm
    2.81 +xen/include/hypervisor-ifs/arch
    2.82 +xen/include/xen/compile.h
    2.83 +xen/tools/elf-reloc
    2.84 +xen/tools/figlet/figlet
    2.85 +xen/xen
    2.86 +xen/xen-syms
    2.87 +xen/xen.*
     3.1 --- a/README	Sun Oct 31 17:37:47 2004 +0000
     3.2 +++ b/README	Sun Oct 31 23:04:40 2004 +0000
     3.3 @@ -11,7 +11,6 @@ University of Cambridge Computer Laborat
     3.4  29 October 2004
     3.5  
     3.6  http://www.cl.cam.ac.uk/netos/xen/
     3.7 -http://www.cl.cam.ac.uk/netos/xen/
     3.8  
     3.9  About the Xen Virtual Machine Monitor
    3.10  =====================================
     4.1 --- a/TODO	Sun Oct 31 17:37:47 2004 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,60 +0,0 @@
     4.4 -Future plans and enhancements
     4.5 -=============================
     4.6 -
     4.7 -For up-to-date details of features currently under implementation,
     4.8 -visit the Xen project roadmap at:
     4.9 -http://www.cl.cam.ac.uk/Research/SRG/netos/xen/roadmap.html
    4.10 -
    4.11 -IO enhancements
    4.12 ----------------
    4.13 -There are also a number of memory management enhancements that didn't
    4.14 -make this release: We have plans for a "universal buffer cache" that
    4.15 -enables otherwise unused system memory to be used by domains in a
    4.16 -read-only fashion.
    4.17 -
    4.18 -Disk scheduling
    4.19 ----------------
    4.20 -The current disk scheduler is rather simplistic (batch round robin),
    4.21 -and could be replaced by e.g. Cello if we have QoS isolation
    4.22 -problems. For most things it seems to work OK, but there's currently
    4.23 -no service differentiation or weighting.
    4.24 -
    4.25 -Improved load-balancing
    4.26 ------------------------
    4.27 -Currently, although Xen runs on SMP and SMT (hyperthreaded) machines,
    4.28 -the scheduling is far from smart -- domains are currently statically
    4.29 -assigned to a CPU when they are created (in a round robin fashion).
    4.30 -We'd like to see a user-space load-balancing daemon that can shift
    4.31 -domains between CPUs as their activity changes.
    4.32 -
    4.33 -Multiprocessor guest VMs
    4.34 -------------------------
    4.35 -Xen currently only supports uniprocessor guest OSes. We have designed
    4.36 -the Xen interface with MP guests in mind, and plan to build an MP
    4.37 -Linux guest in due course. Basically, an MP guest would consist of
    4.38 -multiple scheduling domains (one per CPU) sharing a single memory
    4.39 -protection domain. The only extra complexity for the Xen VM system is
    4.40 -ensuring that when a page transitions from holding a page table or
    4.41 -page directory to a write-able page, we must ensure that no other CPU
    4.42 -still has the page in its TLB to ensure memory system integrity.  One
    4.43 -other issue for supporting MP guests is that we'll need some sort of
    4.44 -CPU gang scheduler, which will require some research.
    4.45 -
    4.46 -Cluster management
    4.47 -------------------
    4.48 -There have been discussions regarding a unified cluster controller
    4.49 -for Xen deployments.  This would leverage the existing features of
    4.50 -Xen to present a uniform control interface for managing a cluster
    4.51 -as a pool of resources, rather than a set of completely distinct
    4.52 -machines.
    4.53 -
    4.54 -64-bit x86
    4.55 -----------
    4.56 -Xen can currently use up to 4GB of memory. It's possible for 32-bit
    4.57 -x86 machines to address up to 64GB, but it requires using a different
    4.58 -page table format that would be rather tedious to support. Our
    4.59 -preferred approach is to virtualize 64-bit x86 (x86/64), as supported
    4.60 -by modern AMD and Intel processors. The large address space provided
    4.61 -by a 64-bit execution model greatly simplifies support for large-memory
    4.62 -configurations. Our implementation for x86/64 is in progress and should
    4.63 -feature in our next major release.
     5.1 --- a/linux-2.6.9-xen-sparse/arch/xen/Makefile	Sun Oct 31 17:37:47 2004 +0000
     5.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile	Sun Oct 31 23:04:40 2004 +0000
     5.3 @@ -64,6 +64,7 @@ dist:
     5.4  archclean:
     5.5  	@if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;
     5.6  	@rm -f arch/xen/arch include/.asm-ignore include/asm-xen/asm
     5.7 +	@rm -f vmlinux-stripped vmlinuz
     5.8  
     5.9  define archhelp
    5.10    echo  '* vmlinuz	- Compressed kernel image'
     6.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Oct 31 17:37:47 2004 +0000
     6.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Oct 31 23:04:40 2004 +0000
     6.3 @@ -1,5 +1,7 @@
     6.4  #
     6.5  # Automatically generated make config: don't edit
     6.6 +# Linux kernel version: 2.6.9-xen0
     6.7 +# Sun Oct 31 21:30:07 2004
     6.8  #
     6.9  CONFIG_XEN=y
    6.10  CONFIG_ARCH_XEN=y
    6.11 @@ -33,6 +35,7 @@ CONFIG_BROKEN_ON_SMP=y
    6.12  #
    6.13  # General setup
    6.14  #
    6.15 +CONFIG_LOCALVERSION=""
    6.16  CONFIG_SWAP=y
    6.17  CONFIG_SYSVIPC=y
    6.18  # CONFIG_POSIX_MQUEUE is not set
    6.19 @@ -53,6 +56,8 @@ CONFIG_IOSCHED_AS=y
    6.20  CONFIG_IOSCHED_DEADLINE=y
    6.21  CONFIG_IOSCHED_CFQ=y
    6.22  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    6.23 +CONFIG_SHMEM=y
    6.24 +# CONFIG_TINY_SHMEM is not set
    6.25  
    6.26  #
    6.27  # Loadable module support
    6.28 @@ -113,10 +118,6 @@ CONFIG_HAVE_DEC_LOCK=y
    6.29  # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
    6.30  #
    6.31  CONFIG_PCI=y
    6.32 -# CONFIG_PCI_GOBIOS is not set
    6.33 -# CONFIG_PCI_GOMMCONFIG is not set
    6.34 -CONFIG_PCI_GODIRECT=y
    6.35 -# CONFIG_PCI_GOANY is not set
    6.36  CONFIG_PCI_DIRECT=y
    6.37  CONFIG_PCI_LEGACY_PROC=y
    6.38  # CONFIG_PCI_NAMES is not set
    6.39 @@ -203,6 +204,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
    6.40  # CONFIG_BLK_DEV_XD is not set
    6.41  # CONFIG_BLK_CPQ_DA is not set
    6.42  CONFIG_BLK_CPQ_CISS_DA=y
    6.43 +# CONFIG_CISS_SCSI_TAPE is not set
    6.44  # CONFIG_BLK_DEV_DAC960 is not set
    6.45  # CONFIG_BLK_DEV_UMEM is not set
    6.46  CONFIG_BLK_DEV_LOOP=y
    6.47 @@ -250,7 +252,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
    6.48  # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
    6.49  CONFIG_IDEDMA_PCI_AUTO=y
    6.50  # CONFIG_IDEDMA_ONLYDISK is not set
    6.51 -CONFIG_BLK_DEV_ADMA=y
    6.52  # CONFIG_BLK_DEV_AEC62XX is not set
    6.53  # CONFIG_BLK_DEV_ALI15X3 is not set
    6.54  # CONFIG_BLK_DEV_AMD74XX is not set
    6.55 @@ -321,7 +322,6 @@ CONFIG_SCSI_AACRAID=y
    6.56  CONFIG_SCSI_AIC7XXX=y
    6.57  CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
    6.58  CONFIG_AIC7XXX_RESET_DELAY_MS=15000
    6.59 -# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
    6.60  CONFIG_AIC7XXX_DEBUG_ENABLE=y
    6.61  CONFIG_AIC7XXX_DEBUG_MASK=0
    6.62  CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
    6.63 @@ -329,7 +329,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
    6.64  CONFIG_SCSI_AIC79XX=y
    6.65  CONFIG_AIC79XX_CMDS_PER_DEVICE=32
    6.66  CONFIG_AIC79XX_RESET_DELAY_MS=15000
    6.67 -# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
    6.68  # CONFIG_AIC79XX_ENABLE_RD_STRM is not set
    6.69  CONFIG_AIC79XX_DEBUG_ENABLE=y
    6.70  CONFIG_AIC79XX_DEBUG_MASK=0
    6.71 @@ -337,7 +336,8 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
    6.72  # CONFIG_SCSI_DPT_I2O is not set
    6.73  # CONFIG_SCSI_ADVANSYS is not set
    6.74  # CONFIG_SCSI_IN2000 is not set
    6.75 -CONFIG_SCSI_MEGARAID=y
    6.76 +# CONFIG_MEGARAID_NEWGEN is not set
    6.77 +# CONFIG_MEGARAID_LEGACY is not set
    6.78  CONFIG_SCSI_SATA=y
    6.79  # CONFIG_SCSI_SATA_SVW is not set
    6.80  CONFIG_SCSI_ATA_PIIX=y
    6.81 @@ -412,6 +412,7 @@ CONFIG_BLK_DEV_MD=y
    6.82  # CONFIG_MD_LINEAR is not set
    6.83  CONFIG_MD_RAID0=y
    6.84  CONFIG_MD_RAID1=y
    6.85 +# CONFIG_MD_RAID10 is not set
    6.86  CONFIG_MD_RAID5=y
    6.87  # CONFIG_MD_RAID6 is not set
    6.88  # CONFIG_MD_MULTIPATH is not set
    6.89 @@ -463,6 +464,7 @@ CONFIG_IP_PNP_DHCP=y
    6.90  # CONFIG_INET_AH is not set
    6.91  # CONFIG_INET_ESP is not set
    6.92  # CONFIG_INET_IPCOMP is not set
    6.93 +# CONFIG_INET_TUNNEL is not set
    6.94  
    6.95  #
    6.96  # IP: Virtual Server Configuration
    6.97 @@ -477,6 +479,8 @@ CONFIG_BRIDGE_NETFILTER=y
    6.98  # IP: Netfilter Configuration
    6.99  #
   6.100  CONFIG_IP_NF_CONNTRACK=m
   6.101 +CONFIG_IP_NF_CT_ACCT=y
   6.102 +# CONFIG_IP_NF_CT_PROTO_SCTP is not set
   6.103  CONFIG_IP_NF_FTP=m
   6.104  # CONFIG_IP_NF_IRC is not set
   6.105  # CONFIG_IP_NF_TFTP is not set
   6.106 @@ -502,18 +506,20 @@ CONFIG_IP_NF_IPTABLES=m
   6.107  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
   6.108  # CONFIG_IP_NF_MATCH_OWNER is not set
   6.109  # CONFIG_IP_NF_MATCH_PHYSDEV is not set
   6.110 +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
   6.111 +# CONFIG_IP_NF_MATCH_REALM is not set
   6.112 +# CONFIG_IP_NF_MATCH_SCTP is not set
   6.113 +# CONFIG_IP_NF_MATCH_COMMENT is not set
   6.114  # CONFIG_IP_NF_FILTER is not set
   6.115 -# CONFIG_IP_NF_NAT is not set
   6.116 -# CONFIG_IP_NF_MANGLE is not set
   6.117  # CONFIG_IP_NF_TARGET_LOG is not set
   6.118  # CONFIG_IP_NF_TARGET_ULOG is not set
   6.119  # CONFIG_IP_NF_TARGET_TCPMSS is not set
   6.120 +# CONFIG_IP_NF_NAT is not set
   6.121 +# CONFIG_IP_NF_MANGLE is not set
   6.122 +# CONFIG_IP_NF_RAW is not set
   6.123  # CONFIG_IP_NF_ARPTABLES is not set
   6.124  # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
   6.125  # CONFIG_IP_NF_COMPAT_IPFWADM is not set
   6.126 -# CONFIG_IP_NF_RAW is not set
   6.127 -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
   6.128 -# CONFIG_IP_NF_MATCH_REALM is not set
   6.129  
   6.130  #
   6.131  # Bridge: Netfilter Configuration
   6.132 @@ -718,6 +724,7 @@ CONFIG_SERIO_I8042=y
   6.133  CONFIG_SERIO_SERPORT=y
   6.134  # CONFIG_SERIO_CT82C710 is not set
   6.135  # CONFIG_SERIO_PCIPS2 is not set
   6.136 +# CONFIG_SERIO_RAW is not set
   6.137  
   6.138  #
   6.139  # Input Device Drivers
   6.140 @@ -758,7 +765,6 @@ CONFIG_HW_CONSOLE=y
   6.141  CONFIG_UNIX98_PTYS=y
   6.142  CONFIG_LEGACY_PTYS=y
   6.143  CONFIG_LEGACY_PTY_COUNT=256
   6.144 -# CONFIG_QIC02_TAPE is not set
   6.145  
   6.146  #
   6.147  # IPMI
   6.148 @@ -936,6 +942,7 @@ CONFIG_LOCKD_V4=y
   6.149  CONFIG_EXPORTFS=m
   6.150  CONFIG_SUNRPC=y
   6.151  # CONFIG_RPCSEC_GSS_KRB5 is not set
   6.152 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
   6.153  # CONFIG_SMB_FS is not set
   6.154  # CONFIG_CIFS is not set
   6.155  # CONFIG_NCP_FS is not set
   6.156 @@ -1008,6 +1015,7 @@ CONFIG_CRYPTO_MD5=m
   6.157  CONFIG_CRYPTO_SHA1=m
   6.158  # CONFIG_CRYPTO_SHA256 is not set
   6.159  # CONFIG_CRYPTO_SHA512 is not set
   6.160 +# CONFIG_CRYPTO_WP512 is not set
   6.161  CONFIG_CRYPTO_DES=m
   6.162  # CONFIG_CRYPTO_BLOWFISH is not set
   6.163  # CONFIG_CRYPTO_TWOFISH is not set
     7.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Oct 31 17:37:47 2004 +0000
     7.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Oct 31 23:04:40 2004 +0000
     7.3 @@ -1,5 +1,7 @@
     7.4  #
     7.5  # Automatically generated make config: don't edit
     7.6 +# Linux kernel version: 2.6.9-xen0
     7.7 +# Sun Oct 31 21:32:23 2004
     7.8  #
     7.9  CONFIG_XEN=y
    7.10  CONFIG_ARCH_XEN=y
    7.11 @@ -32,6 +34,7 @@ CONFIG_BROKEN_ON_SMP=y
    7.12  #
    7.13  # General setup
    7.14  #
    7.15 +CONFIG_LOCALVERSION=""
    7.16  CONFIG_SWAP=y
    7.17  CONFIG_SYSVIPC=y
    7.18  # CONFIG_POSIX_MQUEUE is not set
    7.19 @@ -51,6 +54,8 @@ CONFIG_IOSCHED_AS=y
    7.20  CONFIG_IOSCHED_DEADLINE=y
    7.21  CONFIG_IOSCHED_CFQ=y
    7.22  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    7.23 +CONFIG_SHMEM=y
    7.24 +# CONFIG_TINY_SHMEM is not set
    7.25  
    7.26  #
    7.27  # Loadable module support
    7.28 @@ -180,9 +185,7 @@ CONFIG_BLK_DEV_SD=m
    7.29  #
    7.30  # SCSI low-level drivers
    7.31  #
    7.32 -# CONFIG_SCSI_AIC7XXX_OLD is not set
    7.33  # CONFIG_SCSI_SATA is not set
    7.34 -# CONFIG_SCSI_EATA_PIO is not set
    7.35  # CONFIG_SCSI_DEBUG is not set
    7.36  
    7.37  #
    7.38 @@ -217,6 +220,7 @@ CONFIG_IP_PNP=y
    7.39  # CONFIG_INET_AH is not set
    7.40  # CONFIG_INET_ESP is not set
    7.41  # CONFIG_INET_IPCOMP is not set
    7.42 +# CONFIG_INET_TUNNEL is not set
    7.43  # CONFIG_IPV6 is not set
    7.44  # CONFIG_NETFILTER is not set
    7.45  
    7.46 @@ -379,6 +383,7 @@ CONFIG_LOCKD_V4=y
    7.47  # CONFIG_EXPORTFS is not set
    7.48  CONFIG_SUNRPC=y
    7.49  # CONFIG_RPCSEC_GSS_KRB5 is not set
    7.50 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
    7.51  # CONFIG_SMB_FS is not set
    7.52  # CONFIG_CIFS is not set
    7.53  # CONFIG_NCP_FS is not set
    7.54 @@ -451,6 +456,7 @@ CONFIG_CRYPTO_MD5=m
    7.55  # CONFIG_CRYPTO_SHA1 is not set
    7.56  # CONFIG_CRYPTO_SHA256 is not set
    7.57  # CONFIG_CRYPTO_SHA512 is not set
    7.58 +# CONFIG_CRYPTO_WP512 is not set
    7.59  # CONFIG_CRYPTO_DES is not set
    7.60  # CONFIG_CRYPTO_BLOWFISH is not set
    7.61  # CONFIG_CRYPTO_TWOFISH is not set