Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen/blkback: Move it from drivers/xen to drivers/block

.. and modify the Makefile and Kconfig files appropriately.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

+9 -9
+8
drivers/block/Kconfig
··· 470 470 block device driver. It communicates with a back-end driver 471 471 in another domain which drives the actual block device. 472 472 473 + config XEN_BLKDEV_BACKEND 474 + tristate "Block-device backend driver" 475 + depends on XEN_BACKEND 476 + help 477 + The block-device backend driver allows the kernel to export its 478 + block devices to other guests via a high-performance shared-memory 479 + interface. 480 + 473 481 config VIRTIO_BLK 474 482 tristate "Virtio block driver (EXPERIMENTAL)" 475 483 depends on EXPERIMENTAL && VIRTIO
+1
drivers/block/Makefile
··· 36 36 obj-$(CONFIG_BLK_DEV_HD) += hd.o 37 37 38 38 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o 39 + obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ 39 40 obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ 40 41 obj-$(CONFIG_BLK_DEV_RBD) += rbd.o 41 42
-8
drivers/xen/Kconfig
··· 37 37 Support for backend device drivers that provide I/O services 38 38 to other virtual machines. 39 39 40 - config XEN_BLKDEV_BACKEND 41 - tristate "Block-device backend driver" 42 - depends on XEN_BACKEND && BLOCK 43 - help 44 - The block-device backend driver allows the kernel to export its 45 - block devices to other guests via a high-performance shared-memory 46 - interface. 47 - 48 40 config XENFS 49 41 tristate "Xen filesystem" 50 42 default y
-1
drivers/xen/Makefile
··· 11 11 obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o 12 12 obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o 13 13 obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o 14 - obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/ 15 14 obj-$(CONFIG_XENFS) += xenfs/ 16 15 obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o 17 16 obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o
drivers/xen/blkback/Makefile drivers/block/xen-blkback/Makefile
drivers/xen/blkback/blkback.c drivers/block/xen-blkback/blkback.c
drivers/xen/blkback/common.h drivers/block/xen-blkback/common.h
drivers/xen/blkback/interface.c drivers/block/xen-blkback/interface.c
drivers/xen/blkback/vbd.c drivers/block/xen-blkback/vbd.c
drivers/xen/blkback/xenbus.c drivers/block/xen-blkback/xenbus.c