ChangeSet 1.1264, 2005/03/24 22:52:13+00:00, mafetter@xxxxxxxxxxxxxxxx
Initial attempt at merging shadow code with head of unstable tree.
Signed-off-by: michael.fetterman@xxxxxxxxxxxx
b/linux-2.6.11-xen-sparse/arch/xen/Kconfig | 174
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig | 1100 ++++
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile | 91
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c | 650 ++
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S | 1077 ++++
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/ldt.c | 270 +
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c | 238 +
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c | 750 +++
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c | 1638
+++++++
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c | 563 ++
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c | 473 ++
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c | 802 +++
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c | 450 +
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/pgtable.c | 445 +
b/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c | 262 +
b/linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c | 458 +
b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c | 621 ++
b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c | 1417
++++++
b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c | 518 ++
b/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c | 808 +++
b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c | 1310
+++++
b/linux-2.6.11-xen-sparse/drivers/xen/privcmd/privcmd.c | 224
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/desc.h | 142
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h | 171
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io.h | 425 +
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h | 203
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 52
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h | 102
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable.h | 487 ++
b/linux-2.6.11-xen-sparse/mm/memory.c | 2303
++++++++++
b/tools/libxc/xc.h | 5
b/tools/misc/Makefile | 5
b/xen/arch/x86/domain.c | 145
b/xen/arch/x86/domain_build.c | 14
b/xen/arch/x86/mm.c | 484 +-
b/xen/arch/x86/shadow.c | 2
b/xen/arch/x86/traps.c | 11
b/xen/arch/x86/vmx.c | 3
b/xen/arch/x86/vmx_io.c | 1
b/xen/arch/x86/x86_32/asm-offsets.c | 3
b/xen/arch/x86/x86_32/traps.c | 1
b/xen/common/dom_mem_ops.c | 22
b/xen/common/keyhandler.c | 1
b/xen/common/page_alloc.c | 129
b/xen/common/schedule.c | 3
b/xen/drivers/char/console.c | 19
b/xen/include/asm-x86/domain.h | 10
b/xen/include/asm-x86/mm.h | 22
b/xen/include/asm-x86/page.h | 15
b/xen/include/asm-x86/shadow.h | 11
b/xen/include/asm-x86/x86_32/page.h | 2
b/xen/include/public/arch-x86_32.h | 7
b/xen/include/xen/domain.h | 2
b/xen/include/xen/perfc_defn.h | 1
b/xen/include/xen/sched.h | 1
linux-2.6.10-xen-sparse/arch/xen/Kconfig | 174
linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig | 1078 ----
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile | 91
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c | 601 --
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S | 1080 ----
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c | 270 -
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c | 232 -
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c | 769 ---
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c | 1550
------
linux-2.6.10-xen-sparse/arch/xen/i386/mm/fault.c | 558 --
linux-2.6.10-xen-sparse/arch/xen/i386/mm/hypervisor.c | 467 --
linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c | 800 ---
linux-2.6.10-xen-sparse/arch/xen/i386/mm/ioremap.c | 440 -
linux-2.6.10-xen-sparse/arch/xen/i386/mm/pageattr.c | 215
linux-2.6.10-xen-sparse/arch/xen/i386/mm/pgtable.c | 430 -
linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c | 262 -
linux-2.6.10-xen-sparse/drivers/xen/balloon/balloon.c | 441 -
linux-2.6.10-xen-sparse/drivers/xen/blkback/blkback.c | 621 --
linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c | 1410
------
linux-2.6.10-xen-sparse/drivers/xen/blkfront/vbd.c | 563 --
linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c | 795 ---
linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c | 1310
-----
linux-2.6.10-xen-sparse/drivers/xen/privcmd/privcmd.c | 218
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/desc.h | 133
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/fixmap.h | 169
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/io.h | 425 -
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/page.h | 207
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 55
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h | 148
linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgtable.h | 501 --
linux-2.6.10-xen-sparse/mm/memory.c | 1849
--------
86 files changed, 18846 insertions(+), 18159 deletions(-)
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/Kconfig
b/linux-2.6.10-xen-sparse/arch/xen/Kconfig
--- a/linux-2.6.10-xen-sparse/arch/xen/Kconfig 2005-04-05 12:20:12 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,174 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
-config XEN
- bool
- default y
- help
- This is the Linux Xen port.
-
-config ARCH_XEN
- bool
- default y
-
-
-config NO_IDLE_HZ
- bool
- default y
-
-
-menu "XEN"
-
-config XEN_PRIVILEGED_GUEST
- bool "Privileged Guest (domain 0)"
- default n
- select XEN_PHYSDEV_ACCESS
- help
- Support for privileged operation (domain 0)
-
-config XEN_PHYSDEV_ACCESS
- bool "Physical device access"
- default XEN_PRIVILEGED_GUEST
- help
- Assume access is available to physical hardware devices
- (e.g., hard drives, network cards). This allows you to configure
- such devices and also includes some low-level support that is
- otherwise not compiled into the kernel.
-
-config XEN_BLKDEV_BACKEND
- bool "Block-device backend driver"
- depends on XEN_PHYSDEV_ACCESS
- default y
- help
- The block-device backend driver allows the kernel to export its
- block devices to other guests via a high-performance shared-memory
- interface.
-
-config XEN_BLKDEV_TAP_BE
- bool "Block Tap support for backend driver (DANGEROUS)"
- depends on XEN_BLKDEV_BACKEND
- default n
- help
- If you intend to use the block tap driver, the backend domain will
- not know the domain id of the real frontend, and so will not be able
- to map its data pages. This modifies the backend to attempt to map
- from both the tap domain and the real frontend. This presents a
- security risk, and so should ONLY be used for development
- with the blktap. This option will be removed as the block drivers
are
- modified to use grant tables.
-
-config XEN_NETDEV_BACKEND
- bool "Network-device backend driver"
- depends on XEN_PHYSDEV_ACCESS
- default y
- help
- The network-device backend driver allows the kernel to export its
- network devices to other guests via a high-performance shared-memory
- interface.
-
-config XEN_BLKDEV_FRONTEND
- bool "Block-device frontend driver"
- default y
- help
- The block-device frontend driver allows the kernel to access block
- devices mounted within another guest OS. Unless you are building a
- dedicated device-driver domain, or your master control domain
- (domain 0), then you almost certainly want to say Y here.
-
-config XEN_NETDEV_FRONTEND
- bool "Network-device frontend driver"
- default y
- help
- The network-device frontend driver allows the kernel to access
- network interfaces within another guest OS. Unless you are building a
- dedicated device-driver domain, or your master control domain
- (domain 0), then you almost certainly want to say Y here.
-
-config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
- bool "Pipelined transmitter (DANGEROUS)"
- depends on XEN_NETDEV_FRONTEND
- default n
- help
- The driver will assume that the backend is pipelining packets for
- transmission: whenever packets are pending in the remote backend,
- the driver will not send asynchronous notifications when it queues
- additional packets for transmission.
- If the backend is a dumb domain, such as a transparent Ethernet
- bridge with no local IP interface, it is safe to say Y here to get
- slightly lower network overhead.
- If the backend has a local IP interface; or may be doing smart things
- like reassembling packets to perform firewall filtering; or if you
- are unsure; or if you experience network hangs when this option is
- enabled; then you must say N here.
-
-config XEN_BLKDEV_TAP
- bool "Block device tap driver"
- default n
- help
- This driver allows a VM to interact on block device channels
- to other VMs. Block messages may be passed through or redirected
- to a character device, allowing device prototyping in application
- space. Odds are that you want to say N here.
-
-config XEN_WRITABLE_PAGETABLES
- bool
- default y
-
-config XEN_SCRUB_PAGES
- bool "Scrub memory before freeing it to Xen"
- default y
- help
- Erase memory contents before freeing it back to Xen's global
- pool. This ensures that any secrets contained within that
- memory (e.g., private keys) cannot be found by other guests that
- may be running on the machine. Most people will want to say Y here.
- If security is not a concern then you may increase performance by
- saying N.
-
-choice
- prompt "Processor Type"
- default X86
-
-config X86
- bool "X86"
- help
- Choose this option if your computer is a X86 architecture.
-
-config X86_64
- bool "X86_64"
- help
- Choose this option if your computer is a X86 architecture.
-
-endchoice
-
-endmenu
-
-config HAVE_ARCH_DEV_ALLOC_SKB
- bool
- default y
-
-source "init/Kconfig"
-
-if X86
-source "arch/xen/i386/Kconfig"
-endif
-
-menu "Executable file formats"
-
-source "fs/Kconfig.binfmt"
-
-endmenu
-
-source "arch/xen/Kconfig.drivers"
-
-source "fs/Kconfig"
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
--- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig 2005-04-05
12:20:12 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,1078 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-xen0
-# Mon Feb 21 13:46:38 2005
-#
-CONFIG_XEN=y
-CONFIG_ARCH_XEN=y
-CONFIG_NO_IDLE_HZ=y
-
-#
-# XEN
-#
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PHYSDEV_ACCESS=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-# CONFIG_XEN_BLKDEV_TAP_BE is not set
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
-# CONFIG_XEN_BLKDEV_TAP is not set
-CONFIG_XEN_WRITABLE_PAGETABLES=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_X86=y
-# CONFIG_X86_64 is not set
-CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home