vhost_scsi: module rename

Rename module and update Kconfig and Makefile.
Add alias for compatibility with old userspace
scripts if any.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Asias He <asias@redhat.com>
Acked-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index bf243177ffe1857df97048ce1f67b1fb385d7f5e..26a64e5b8a580d0a7700a63c17a8d2a0465bb4cd 100644 (file)
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -9,6 +9,10 @@ config VHOST_NET
          To compile this driver as a module, choose M here: the module will
          be called vhost_net.
 
-if STAGING
-source "drivers/vhost/Kconfig.tcm"
-endif
+config VHOST_SCSI
+       tristate "VHOST_SCSI TCM fabric driver"
+       depends on TARGET_CORE && EVENTFD && m
+       default n
+       ---help---
+       Say M here to enable the vhost_scsi TCM fabric module
+       for use with virtio-scsi guests

diff --git a/drivers/vhost/Kconfig.tcm b/drivers/vhost/Kconfig.tcm
deleted file mode 100644 (file)
index 7e3aa28..0000000
--- a/drivers/vhost/Kconfig.tcm
+++ /dev/null
@@ -1,6 +0,0 @@
-config TCM_VHOST
-       tristate "TCM_VHOST fabric module"
-       depends on TARGET_CORE && EVENTFD && m
-       default n
-       ---help---
-       Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests

diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile
index 6ea9cecb1fb16139b529e2f556f386464c813db5..ef21d5fdfa7d142175c9de3f24dabc39f4bd6b32 100644 (file)
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_VHOST_NET) += vhost_net.o
 vhost_net-y := vhost.o net.o
 
-obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o
-tcm_vhost-y := scsi.o
+obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
+vhost_scsi-y := scsi.o

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index eb1aa56dced898bd50880e915b8133bef27332e5..5179f7aa1b0bef8dee4dd813607bd2684ac29943 100644 (file)
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -2136,7 +2136,8 @@ static void tcm_vhost_exit(void)
        destroy_workqueue(tcm_vhost_workqueue);
 };
 
-MODULE_DESCRIPTION("TCM_VHOST series fabric driver");
+MODULE_DESCRIPTION("VHOST_SCSI series fabric driver");
+MODULE_ALIAS("tcm_vhost");
 MODULE_LICENSE("GPL");
 module_init(tcm_vhost_init);
 module_exit(tcm_vhost_exit);