mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1159.212.26 (41f28aabyam1d9KxJTuTjomL3m7ZlA)
manual merge
This commit is contained in:
iap10@labyrinth.cl.cam.ac.uk committed
commit
c742b4cc7f
1 file changed
+23
-38
@@ -32,8 +32,7 @@ config XEN_PRIVILEGED_GUEST
|
||||
|
||||
config XEN_PHYSDEV_ACCESS
|
||||
bool "Physical device access"
|
||||
default y if XEN_PRIVILEGED_GUEST
|
||||
default n if !XEN_PRIVILEGED_GUEST
|
||||
default XEN_PRIVILEGED_GUEST
|
||||
help
|
||||
Assume access is available to physical hardware devices
|
||||
(e.g., hard drives, network cards). This allows you to configure
|
||||
@@ -42,16 +41,16 @@ config XEN_PHYSDEV_ACCESS
|
||||
|
||||
config XEN_BLKDEV_BACKEND
|
||||
bool "Block-device backend driver"
|
||||
default y if XEN_PHYSDEV_ACCESS
|
||||
default n if !XEN_PHYSDEV_ACCESS
|
||||
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.
|
||||
|
||||
if XEN_BLKDEV_BACKEND
|
||||
config XEN_BLKDEV_TAP_BE
|
||||
bool "Block Tap support for backend driver (DANGEROUS)"
|
||||
depends on XEN_BLDEV_BACKEND
|
||||
default n
|
||||
help
|
||||
If you intend to use the block tap driver, the backend domain will
|
||||
@@ -61,12 +60,11 @@ config XEN_BLKDEV_TAP_BE
|
||||
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.
|
||||
endif
|
||||
|
||||
config XEN_NETDEV_BACKEND
|
||||
bool "Network-device backend driver"
|
||||
default y if XEN_PHYSDEV_ACCESS
|
||||
default n if !XEN_PHYSDEV_ACCESS
|
||||
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
|
||||
@@ -90,9 +88,9 @@ config XEN_NETDEV_FRONTEND
|
||||
dedicated device-driver domain, or your master control domain
|
||||
(domain 0), then you almost certainly want to say Y here.
|
||||
|
||||
if XEN_NETDEV_FRONTEND
|
||||
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
|
||||
@@ -106,7 +104,6 @@ config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
|
||||
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.
|
||||
endif
|
||||
|
||||
config XEN_BLKDEV_TAP
|
||||
bool "Block device tap driver"
|
||||
@@ -133,40 +130,28 @@ config XEN_SCRUB_PAGES
|
||||
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
|
||||
|
||||
#config VT
|
||||
# bool
|
||||
# default y
|
||||
|
||||
#config VT_CONSOLE
|
||||
# bool
|
||||
# default y
|
||||
|
||||
#config HW_CONSOLE
|
||||
# bool
|
||||
# default y
|
||||
|
||||
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
|
||||
|
||||
source "init/Kconfig"
|
||||
|
||||
if X86
|
||||
|
||||