| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] [PATCH] blktap: Move from drivers/xen to drivers/block
From: Daniel Stodden <dns@xxxxxxxxxxxx>
Signed-off-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
---
drivers/block/Kconfig | 9 +++++++++
drivers/block/Makefile | 1 +
drivers/{xen => block}/blktap/Makefile | 2 +-
drivers/{xen => block}/blktap/blktap.h | 0
drivers/{xen => block}/blktap/control.c | 0
drivers/{xen => block}/blktap/device.c | 0
drivers/{xen => block}/blktap/request.c | 0
drivers/{xen => block}/blktap/ring.c | 0
drivers/{xen => block}/blktap/sysfs.c | 0
drivers/xen/Kconfig | 11 -----------
drivers/xen/Makefile | 1 -
11 files changed, 11 insertions(+), 13 deletions(-)
rename drivers/{xen => block}/blktap/Makefile (59%)
rename drivers/{xen => block}/blktap/blktap.h (100%)
rename drivers/{xen => block}/blktap/control.c (100%)
rename drivers/{xen => block}/blktap/device.c (100%)
rename drivers/{xen => block}/blktap/request.c (100%)
rename drivers/{xen => block}/blktap/ring.c (100%)
rename drivers/{xen => block}/blktap/sysfs.c (100%)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index bea8ae7..c4a55a3 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -471,4 +471,13 @@ config BLK_DEV_HD
If unsure, say N.
+config BLK_DEV_TAP
+ tristate "Blktap userspace devices"
+ help
+ The block tap driver allows block device requests to be
+ redirected to processes, through a device interface.
+ Doing so allows user-space development of high-performance
+ block storage backends, where disk images may be implemented
+ as files, in memory, or on other hosts across the network.
+
endif # BLK_DEV
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 7755a5e..8389917 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
+obj-$(CONFIG_BLK_DEV_TAP) += blktap/
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
diff --git a/drivers/xen/blktap/Makefile b/drivers/block/blktap/Makefile
similarity index 59%
rename from drivers/xen/blktap/Makefile
rename to drivers/block/blktap/Makefile
index 822b4e4..923a7c5 100644
--- a/drivers/xen/blktap/Makefile
+++ b/drivers/block/blktap/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_XEN_BLKDEV_TAP) := blktap.o
+obj-$(CONFIG_BLK_DEV_TAP) := blktap.o
blktap-objs := control.o ring.o device.o request.o sysfs.o
diff --git a/drivers/xen/blktap/blktap.h b/drivers/block/blktap/blktap.h
similarity index 100%
rename from drivers/xen/blktap/blktap.h
rename to drivers/block/blktap/blktap.h
diff --git a/drivers/xen/blktap/control.c b/drivers/block/blktap/control.c
similarity index 100%
rename from drivers/xen/blktap/control.c
rename to drivers/block/blktap/control.c
diff --git a/drivers/xen/blktap/device.c b/drivers/block/blktap/device.c
similarity index 100%
rename from drivers/xen/blktap/device.c
rename to drivers/block/blktap/device.c
diff --git a/drivers/xen/blktap/request.c b/drivers/block/blktap/request.c
similarity index 100%
rename from drivers/xen/blktap/request.c
rename to drivers/block/blktap/request.c
diff --git a/drivers/xen/blktap/ring.c b/drivers/block/blktap/ring.c
similarity index 100%
rename from drivers/xen/blktap/ring.c
rename to drivers/block/blktap/ring.c
diff --git a/drivers/xen/blktap/sysfs.c b/drivers/block/blktap/sysfs.c
similarity index 100%
rename from drivers/xen/blktap/sysfs.c
rename to drivers/block/blktap/sysfs.c
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c34e71c..b951b83 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -45,17 +45,6 @@ config XEN_BLKDEV_BACKEND
interface.
-config XEN_BLKDEV_TAP
- tristate "Block-device tap backend driver"
- depends on XEN_BACKEND && BLOCK
- help
- The block tap driver is an alternative to the block back driver
- and allows VM block requests to be redirected to userspace through
- a device interface. The tap allows user-space development of
- high-performance block backends, where disk images may be implemented
- as files, in memory, or on other hosts across the network. This
- driver can safely coexist with the existing blockback driver.
-
config XEN_BLKBACK_PAGEMAP
tristate
depends on XEN_BLKDEV_BACKEND != n && XEN_BLKDEV_TAP != n
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index aa4d6e2..44f835e 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -6,6 +6,5 @@ obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += balloon.o
obj-$(CONFIG_XEN_DEV_EVTCHN) += evtchn.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
-obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
obj-$(CONFIG_XENFS) += xenfs/
obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
\ No newline at end of file
--
1.7.0.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home