bitkeeper revision 1.867 (4083dc17x4KfiVBhD7lCtJYk8h8OjA)

Arrange directory structure for new I/O drivers.

15 files changed, 69 insertions, 31 deletions

diff --git a/.rootkeys b/.rootkeys
index ae6f465049..3c47fa671f 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -668,12 +668,16 @@
 40420a73Wou6JlsZDiu6YwjYomsm7A xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/evtchn.c
 3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.26-sparse/arch/xen/drivers/network/Makefile
 3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
-4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
-4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c
-4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h
-4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c
-405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
-405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c
+4083dc16z0jvZEH4PiVDbDRreaNp6w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
+4083dc16KQus88a4U3uCV6qVCA6_8Q xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile
+4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile
+4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c
+4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h
+4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c
+4083dc16-Kd5y9psK_yk161sme5j5Q xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
+4083dc16UmHXxS9g_UFVnkUpN-oP2Q xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile
+405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile
+405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c
 3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.26-sparse/arch/xen/kernel/Makefile
 4075806dE5mQwlVUf8-t3YXjiMMWDQ xenolinux-2.4.26-sparse/arch/xen/kernel/ctrl_if.c
 3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.26-sparse/arch/xen/kernel/entry.S
diff --git a/xenolinux-2.4.26-sparse/arch/xen/Makefile b/xenolinux-2.4.26-sparse/arch/xen/Makefile
index aba91a2414..3abb3c7421 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/Makefile
@@ -51,7 +51,7 @@ HEAD := arch/xen/kernel/head.o arch/xen/kernel/init_task.o
 SUBDIRS += arch/xen/kernel arch/xen/mm arch/xen/lib
 SUBDIRS += arch/xen/drivers/console 
 SUBDIRS += arch/xen/drivers/evtchn
-ifdef CONFIG_XEN_PHYSDEV_ACCESS
+ifdef CONFIG_XEN_NEWIO
 SUBDIRS += arch/xen/drivers/vblkif
 SUBDIRS += arch/xen/drivers/vnetif
 else
@@ -66,7 +66,7 @@ endif
 CORE_FILES += arch/xen/kernel/kernel.o arch/xen/mm/mm.o
 CORE_FILES += arch/xen/drivers/evtchn/drv.o
 CORE_FILES += arch/xen/drivers/console/drv.o
-ifdef CONFIG_XEN_PHYSDEV_ACCESS
+ifdef CONFIG_XEN_NEWIO
 CORE_FILES += arch/xen/drivers/vblkif/drv.o
 CORE_FILES += arch/xen/drivers/vnetif/drv.o
 else
diff --git a/xenolinux-2.4.26-sparse/arch/xen/config.in b/xenolinux-2.4.26-sparse/arch/xen/config.in
index c66383f643..05d61a0314 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/config.in
+++ b/xenolinux-2.4.26-sparse/arch/xen/config.in
@@ -15,7 +15,10 @@ define_bool CONFIG_UID16 y
 mainmenu_option next_comment
 comment 'Xen'
 bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST
-bool 'Support for direct physical device access' CONFIG_XEN_PHYSDEV_ACCESS
+bool 'New I/O model (no drivers in Xen) [EXPERIMENTAL]' CONFIG_XEN_NEWIO
+if [ "$CONFIG_XEN_NEWIO" = "y" ]; then
+  bool 'Device-driver domain (physical device access)' CONFIG_XEN_PHYSDEV_ACCESS
+fi
 endmenu
 # The IBM S/390 patch needs this.
 define_bool CONFIG_NO_IDLE_HZ y
@@ -155,24 +158,7 @@ if [ "$CONFIG_NET" = "y" ]; then
    source net/Config.in
 fi
 
-if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "n" ]; then
-   #
-   # Block device driver configuration
-   #
-   mainmenu_option next_comment
-   comment 'Block devices'
-   tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
-   dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
-   tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
-   if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
-      int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
-   fi
-   dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
-   bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
-   bool 'XenoLinux virtual block device support' CONFIG_XEN_VBD
-   define_bool CONFIG_BLK_DEV_HD n
-   endmenu
-else
+if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    mainmenu_option next_comment
    comment 'ATA/IDE/MFM/RLL support'
 
@@ -244,6 +230,23 @@ else
    # input before char - char/joystick depends on it. As does USB.
    #
    source drivers/input/Config.in
+else
+   #
+   # Block device driver configuration
+   #
+   mainmenu_option next_comment
+   comment 'Block devices'
+   tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
+   dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
+   tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
+   if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+      int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
+   fi
+   dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
+   bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
+   bool 'XenoLinux virtual block device support' CONFIG_XEN_VBD
+   define_bool CONFIG_BLK_DEV_HD n
+   endmenu
 fi
 
 source drivers/char/Config.in
diff --git a/xenolinux-2.4.26-sparse/arch/xen/defconfig b/xenolinux-2.4.26-sparse/arch/xen/defconfig
index 4d3c32df74..eaa9171b1f 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/defconfig
+++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig
@@ -11,7 +11,7 @@ CONFIG_UID16=y
 # Xen
 #
 CONFIG_XEN_PRIVILEGED_GUEST=y
-# CONFIG_XEN_PHYSDEV_ACCESS is not set
+# CONFIG_XEN_NEWIO is not set
 CONFIG_NO_IDLE_HZ=y
 
 #
diff --git a/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev b/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
index 8255e6c9ff..69aa6c0856 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
+++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
@@ -11,6 +11,7 @@ CONFIG_UID16=y
 # Xen
 #
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_NEWIO=y
 CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_NO_IDLE_HZ=y
 
@@ -48,6 +49,8 @@ CONFIG_X86_PGE=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
 
 #
 # General setup
@@ -216,7 +219,6 @@ CONFIG_IP_NF_TARGET_ULOG=y
 #
 #    SCTP Configuration (EXPERIMENTAL)
 #
-CONFIG_IPV6_SCTP__=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -299,6 +301,7 @@ CONFIG_BLK_DEV_ALI15X3=y
 CONFIG_WDC_ALI15X3=y
 CONFIG_BLK_DEV_AMD74XX=y
 CONFIG_AMD74XX_OVERRIDE=y
+# CONFIG_BLK_DEV_ATIIXP is not set
 CONFIG_BLK_DEV_CMD64X=y
 CONFIG_BLK_DEV_TRIFLEX=y
 CONFIG_BLK_DEV_CY82C693=y
@@ -340,6 +343,7 @@ CONFIG_BLK_DEV_PDC202XX=y
 # CONFIG_BLK_DEV_ATARAID is not set
 # CONFIG_BLK_DEV_ATARAID_PDC is not set
 # CONFIG_BLK_DEV_ATARAID_HPT is not set
+# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
 # CONFIG_BLK_DEV_ATARAID_SII is not set
 
 #
@@ -519,6 +523,7 @@ CONFIG_TULIP=y
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
+# CONFIG_FORCEDETH is not set
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 # CONFIG_8139CP is not set
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
index 35986ca54a..20c8192d3d 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
@@ -1,3 +1,10 @@
+
 O_TARGET := drv.o
-obj-y := block.o vbd.o
+
+subdir-y += frontend
+obj-y    += frontend/drv.o
+
+subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
+obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o
+
 include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile
new file mode 100644
index 0000000000..032d02d7cc
--- /dev/null
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile
@@ -0,0 +1,3 @@
+O_TARGET := drv.o
+obj-y := main.o
+include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile
new file mode 100644
index 0000000000..35986ca54a
--- /dev/null
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile
@@ -0,0 +1,3 @@
+O_TARGET := drv.o
+obj-y := block.o vbd.o
+include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c
index d00dd98f7b..d00dd98f7b 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h
index e41e03970e..e41e03970e 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c
index e08b976c56..e08b976c56 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
index 304c2e78ef..20c8192d3d 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
@@ -1,3 +1,10 @@
+
 O_TARGET := drv.o
-obj-y := vnetif.o
+
+subdir-y += frontend
+obj-y    += frontend/drv.o
+
+subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
+obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o
+
 include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile
new file mode 100644
index 0000000000..032d02d7cc
--- /dev/null
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile
@@ -0,0 +1,3 @@
+O_TARGET := drv.o
+obj-y := main.o
+include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile
new file mode 100644
index 0000000000..304c2e78ef
--- /dev/null
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile
@@ -0,0 +1,3 @@
+O_TARGET := drv.o
+obj-y := vnetif.o
+include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c
index d1a4b21ad0..d1a4b21ad0 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c