diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-05-02 03:52:59 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-05-02 13:40:22 +0300 |
| commit | 181c04a357bb791587c55a99362c2fdde2c64f18 (patch) | |
| tree | 50d9fac3e8320494a9f86e9d430578ffa412bd60 /drivers/vhost | |
| parent | 5012a3a384ad917b5c72a918607bd0cc64452ff8 (diff) | |
| download | op-kernel-dev-181c04a357bb791587c55a99362c2fdde2c64f18.zip op-kernel-dev-181c04a357bb791587c55a99362c2fdde2c64f18.tar.gz | |
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>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/vhost/Kconfig.tcm | 6 | ||||
| -rw-r--r-- | drivers/vhost/Makefile | 4 | ||||
| -rw-r--r-- | drivers/vhost/scsi.c | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index bf24317..26a64e5 100644 --- 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 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 6ea9cec..ef21d5f 100644 --- 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 eb1aa56..5179f7a 100644 --- 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); |
