The storage driver (storvsc_drv.c) handles all block storage devices assigned to Linux guests hosted on Hyper-V. This driver has been in the staging tree for a while and this patch moves it out of the staging area. This patch is based on the storvsc patches that are already on Greg's queue for the staging tree. This patch-set addressed Christoph's review comments. If need be, I can re-send this patch-set in Greg's queue or I can send the fully patched storvsc_drv.c. Signed-off-by: K. Y. Srinivasan <kys@xxxxxxxxxxxxx> --- drivers/scsi/Kconfig | 7 +++++++ drivers/scsi/Makefile | 3 +++ drivers/{staging/hv => scsi}/storvsc_drv.c | 0 3 files changed, 10 insertions(+), 0 deletions(-) rename drivers/{staging/hv => scsi}/storvsc_drv.c (100%) diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 16570aa..d3d18e8 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -662,6 +662,13 @@ config VMWARE_PVSCSI To compile this driver as a module, choose M here: the module will be called vmw_pvscsi. +config HYPERV_STORAGE + tristate "Microsoft Hyper-V virtual storage driver" + depends on SCSI && HYPERV + default HYPERV + help + Select this option to enable the Hyper-V virtual storage driver. + config LIBFC tristate "LibFC module" select SCSI_FC_ATTRS diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 2b88749..e4c1a69 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI) += libiscsi.o bnx2i/ obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/ obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o +obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o obj-$(CONFIG_ARM) += arm/ @@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o scsi_mod-y += scsi_trace.o scsi_mod-$(CONFIG_PM) += scsi_pm.o +hv_storvsc-y := storvsc_drv.o + scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o sd_mod-objs := sd.o diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/scsi/storvsc_drv.c similarity index 100% rename from drivers/staging/hv/storvsc_drv.c rename to drivers/scsi/storvsc_drv.c -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html