Skip to content

Commit

Permalink
vhost_scsi: module rename
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael S. Tsirkin committed May 2, 2013
1 parent 5012a3a commit 181c04a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
10 changes: 7 additions & 3 deletions drivers/vhost/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 0 additions & 6 deletions drivers/vhost/Kconfig.tcm

This file was deleted.

4 changes: 2 additions & 2 deletions drivers/vhost/Makefile
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion drivers/vhost/scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit 181c04a

Please sign in to comment.