1.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Fri Jul 14 14:02:59 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Fri Jul 14 14:18:39 2006 +0100
     1.3 @@ -33,6 +33,11 @@ config XEN_PRIVCMD
     1.4  	depends on PROC_FS
     1.5  	default y
     1.6  
     1.7 +config XEN_XENBUS_DEV
     1.8 +	bool
     1.9 +	depends on PROC_FS
    1.10 +	default y
    1.11 +
    1.12  config XEN_BACKEND
    1.13          tristate "Backend driver support"
    1.14          default y
    1.15 @@ -40,46 +45,6 @@ config XEN_BACKEND
    1.16            Support for backend device drivers that provide I/O services
    1.17            to other virtual machines.
    1.18  
    1.19 -config XEN_PCIDEV_BACKEND
    1.20 -	tristate "PCI device backend driver"
    1.21 -	depends on PCI && XEN_BACKEND
    1.22 -	default XEN_PRIVILEGED_GUEST
    1.23 -	help
    1.24 -	  The PCI device backend driver allows the kernel to export arbitrary
    1.25 -	  PCI devices to other guests. If you select this to be a module, you
    1.26 -	  will need to make sure no other driver has bound to the device(s)
    1.27 -	  you want to make visible to other guests.
    1.28 -
    1.29 -choice
    1.30 -	prompt "PCI Backend Mode"
    1.31 -	depends on XEN_PCIDEV_BACKEND
    1.32 -	default XEN_PCIDEV_BACKEND_VPCI
    1.33 -
    1.34 -config XEN_PCIDEV_BACKEND_VPCI
    1.35 -	bool "Virtual PCI"
    1.36 -	---help---
    1.37 -	  This PCI Backend hides the true PCI topology and makes the frontend
    1.38 -	  think there is a single PCI bus with only the exported devices on it.
    1.39 -	  For example, a device at 03:05.0 will be re-assigned to 00:00.0. A
    1.40 -	  second device at 02:1a.0 will be re-assigned to 00:01.0.
    1.41 -
    1.42 -config XEN_PCIDEV_BACKEND_PASS
    1.43 -	bool "Passthrough"
    1.44 -	---help---
    1.45 -	  This PCI Backend provides a real view of the PCI topology to the
    1.46 -	  frontend (for example, a device at 06:01.b will still appear at
    1.47 -	  06:01.b to the frontend). This is similar to how Xen 2.0.x exposed
    1.48 -	  PCI devices to its driver domains. This may be required for drivers
    1.49 -	  which depend on finding their hardward in certain bus/slot
    1.50 -	  locations.
    1.51 -
    1.52 -endchoice
    1.53 -
    1.54 -config XEN_PCIDEV_BE_DEBUG
    1.55 -	bool "PCI Backend Debugging"
    1.56 -	depends on XEN_PCIDEV_BACKEND
    1.57 -	default n
    1.58 -
    1.59  config XEN_BLKDEV_BACKEND
    1.60  	tristate "Block-device backend driver"
    1.61          depends on XEN_BACKEND
    1.62 @@ -89,13 +54,8 @@ config XEN_BLKDEV_BACKEND
    1.63  	  block devices to other guests via a high-performance shared-memory
    1.64  	  interface.
    1.65  
    1.66 -config XEN_XENBUS_DEV
    1.67 -	bool
    1.68 -	depends on PROC_FS
    1.69 -	default y
    1.70 -
    1.71  config XEN_BLKDEV_TAP
    1.72 -	tristate "Block device tap backend"
    1.73 +	tristate "Block-device tap backend driver"
    1.74  	depends on XEN_BACKEND
    1.75  	default XEN_PRIVILEGED_GUEST
    1.76  	help
    1.77 @@ -136,6 +96,46 @@ config XEN_NETDEV_LOOPBACK
    1.78  	  A two-interface loopback device to emulate a local netfront-netback
    1.79  	  connection.
    1.80  
    1.81 +config XEN_PCIDEV_BACKEND
    1.82 +	tristate "PCI-device backend driver"
    1.83 +	depends on PCI && XEN_BACKEND
    1.84 +	default XEN_PRIVILEGED_GUEST
    1.85 +	help
    1.86 +	  The PCI device backend driver allows the kernel to export arbitrary
    1.87 +	  PCI devices to other guests. If you select this to be a module, you
    1.88 +	  will need to make sure no other driver has bound to the device(s)
    1.89 +	  you want to make visible to other guests.
    1.90 +
    1.91 +choice
    1.92 +	prompt "PCI Backend Mode"
    1.93 +	depends on XEN_PCIDEV_BACKEND
    1.94 +	default XEN_PCIDEV_BACKEND_VPCI
    1.95 +
    1.96 +config XEN_PCIDEV_BACKEND_VPCI
    1.97 +	bool "Virtual PCI"
    1.98 +	---help---
    1.99 +	  This PCI Backend hides the true PCI topology and makes the frontend
   1.100 +	  think there is a single PCI bus with only the exported devices on it.
   1.101 +	  For example, a device at 03:05.0 will be re-assigned to 00:00.0. A
   1.102 +	  second device at 02:1a.0 will be re-assigned to 00:01.0.
   1.103 +
   1.104 +config XEN_PCIDEV_BACKEND_PASS
   1.105 +	bool "Passthrough"
   1.106 +	---help---
   1.107 +	  This PCI Backend provides a real view of the PCI topology to the
   1.108 +	  frontend (for example, a device at 06:01.b will still appear at
   1.109 +	  06:01.b to the frontend). This is similar to how Xen 2.0.x exposed
   1.110 +	  PCI devices to its driver domains. This may be required for drivers
   1.111 +	  which depend on finding their hardward in certain bus/slot
   1.112 +	  locations.
   1.113 +
   1.114 +endchoice
   1.115 +
   1.116 +config XEN_PCIDEV_BE_DEBUG
   1.117 +	bool "PCI Backend Debugging"
   1.118 +	depends on XEN_PCIDEV_BACKEND
   1.119 +	default n
   1.120 +
   1.121  config XEN_TPMDEV_BACKEND
   1.122  	tristate "TPM-device backend driver"
   1.123          depends on XEN_BACKEND
   1.124 @@ -195,7 +195,7 @@ config XEN_SYSFS
   1.125  	depends on SYSFS
   1.126  	default y
   1.127  	help
   1.128 -		Xen hypervisor attributes will show up under /sys/hypervisor/.
   1.129 +	  Xen hypervisor attributes will show up under /sys/hypervisor/.
   1.130  
   1.131  choice
   1.132  	prompt "Xen version compatibility"