diff options
| -rw-r--r-- | drivers/block/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/block/Makefile | 1 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/Makefile (renamed from drivers/xen/blkback/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/blkback.c (renamed from drivers/xen/blkback/blkback.c) | 0 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/common.h (renamed from drivers/xen/blkback/common.h) | 0 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/interface.c (renamed from drivers/xen/blkback/interface.c) | 0 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/vbd.c (renamed from drivers/xen/blkback/vbd.c) | 0 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/xenbus.c (renamed from drivers/xen/blkback/xenbus.c) | 0 | ||||
| -rw-r--r-- | drivers/xen/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/xen/Makefile | 1 |
10 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 83c32cb..9abb646 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -470,6 +470,14 @@ config XEN_BLKDEV_FRONTEND block device driver. It communicates with a back-end driver in another domain which drives the actual block device. +config XEN_BLKDEV_BACKEND + tristate "Block-device backend driver" + depends on XEN_BACKEND + 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 VIRTIO_BLK tristate "Virtio block driver (EXPERIMENTAL)" depends on EXPERIMENTAL && VIRTIO diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 40528ba..76646e9 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o obj-$(CONFIG_BLK_DEV_HD) += hd.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o +obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ obj-$(CONFIG_BLK_DEV_RBD) += rbd.o diff --git a/drivers/xen/blkback/Makefile b/drivers/block/xen-blkback/Makefile index f1ae1ff..f1ae1ff 100644 --- a/drivers/xen/blkback/Makefile +++ b/drivers/block/xen-blkback/Makefile diff --git a/drivers/xen/blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 59a2bae..59a2bae 100644 --- a/drivers/xen/blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c diff --git a/drivers/xen/blkback/common.h b/drivers/block/xen-blkback/common.h index 6257c11..6257c11 100644 --- a/drivers/xen/blkback/common.h +++ b/drivers/block/xen-blkback/common.h diff --git a/drivers/xen/blkback/interface.c b/drivers/block/xen-blkback/interface.c index 163aed4..163aed4 100644 --- a/drivers/xen/blkback/interface.c +++ b/drivers/block/xen-blkback/interface.c diff --git a/drivers/xen/blkback/vbd.c b/drivers/block/xen-blkback/vbd.c index d0ff4cf..d0ff4cf 100644 --- a/drivers/xen/blkback/vbd.c +++ b/drivers/block/xen-blkback/vbd.c diff --git a/drivers/xen/blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index b41ed65d..b41ed65d 100644 --- a/drivers/xen/blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index fb1af62..a59638b3 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -37,14 +37,6 @@ config XEN_BACKEND Support for backend device drivers that provide I/O services to other virtual machines. -config XEN_BLKDEV_BACKEND - tristate "Block-device backend driver" - depends on XEN_BACKEND && BLOCK - 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 XENFS tristate "Xen filesystem" default y diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 29c0a41..f420f1f 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o -obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ obj-$(CONFIG_XENFS) += xenfs/ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o |
