Staging: hv: move hyperv code out of staging directory

After many years wandering the desert, it is finally time for the
Microsoft HyperV code to move out of the staging directory.  Or at least
the core hyperv bus code, and the utility driver, the rest still have
some review to get through by the various subsystem maintainers.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 95b9e7eefadc9b5b14493977524139d29bb16f61..ce3c35f4041c89a1f37cc63817dd0aeff92f9dfc 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -130,4 +130,6 @@ source "drivers/iommu/Kconfig"
 
 source "drivers/virt/Kconfig"
 
+source "drivers/hv/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index 7fa433a7030c4e00d300e000702ce7775dbc74b2..ef693cfb4813e859e4b8b4a7b4382fd5fcc0ab78 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -127,3 +127,5 @@ obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
 
 # Virtualization drivers
 obj-$(CONFIG_VIRT_DRIVERS)     += virt/
+obj-$(CONFIG_HYPERV)           += hv/
+

diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
new file mode 100644 (file)
index 0000000..9fa09ac
--- /dev/null
+++ b/drivers/hv/Kconfig
@@ -0,0 +1,14 @@
+config HYPERV
+       tristate "Microsoft Hyper-V client drivers"
+       depends on X86 && ACPI && PCI
+       help
+         Select this option to run Linux as a Hyper-V client operating
+         system.
+
+config HYPERV_UTILS
+       tristate "Microsoft Hyper-V Utilities driver"
+       depends on HYPERV && CONNECTOR && NLS
+       help
+         Select this option to enable the Hyper-V Utilities.
+
+

diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile
new file mode 100644 (file)
index 0000000..a23938b
--- /dev/null
+++ b/drivers/hv/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_HYPERV)           += hv_vmbus.o
+obj-$(CONFIG_HYPERV_UTILS)     += hv_utils.o
+
+hv_vmbus-y := vmbus_drv.o \
+                hv.o connection.o channel.o \
+                channel_mgmt.o ring_buffer.o
+hv_utils-y := hv_util.o hv_kvp.o

diff --git a/drivers/staging/hv/channel.c b/drivers/hv/channel.c
similarity index 99%
rename from drivers/staging/hv/channel.c
rename to drivers/hv/channel.c
index b6f3d38a6dbb5c8fbf6b424d185dd84e9d01328d..406537420fffdc0b90c008dad53205bd19f2acfe 100644 (file)
--- a/drivers/staging/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -26,8 +26,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 #define NUM_PAGES_SPANNED(addr, len) \

diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
similarity index 99%
rename from drivers/staging/hv/channel_mgmt.c
rename to drivers/hv/channel_mgmt.c
index 9f007522a9d5a20259d6200ae6eb77e1590eb454..41bf287baa1c5d1d8ea527f28ca86d32700282fa 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -28,8 +28,8 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/completion.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 struct vmbus_channel_message_table_entry {

diff --git a/drivers/staging/hv/connection.c b/drivers/hv/connection.c
similarity index 99%
rename from drivers/staging/hv/connection.c
rename to drivers/hv/connection.c
index 649b91bcd8c1082830caae876c070270c7cf3ff1..5f438b6500687e44cc68e66be7c38c72fd3dcba5 100644 (file)
--- a/drivers/staging/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -29,8 +29,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 

diff --git a/drivers/staging/hv/hv.c b/drivers/hv/hv.c
similarity index 99%
rename from drivers/staging/hv/hv.c
rename to drivers/hv/hv.c
index 06f1e158c27cdb727507395bc5c4b2b263bb6344..931b7b0307847d1ba4a2f1b0d0289d4b2c9d8a98 100644 (file)
--- a/drivers/staging/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -25,8 +25,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 /* The one and only */

diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
similarity index 99%
rename from drivers/staging/hv/hv_kvp.c
rename to drivers/hv/hv_kvp.c
index 1e9515cc6094ac160e556fb8d7a812bfb1126fd1..69c4c985daeb678d714f8b7229adc171db2b2406 100644 (file)
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -26,8 +26,8 @@
 #include <linux/nls.h>
 #include <linux/connector.h>
 #include <linux/workqueue.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hv_kvp.h"
 
 

diff --git a/drivers/staging/hv/hv_kvp.h b/drivers/hv/hv_kvp.h
similarity index 100%
rename from drivers/staging/hv/hv_kvp.h
rename to drivers/hv/hv_kvp.h

diff --git a/drivers/staging/hv/hv_util.c b/drivers/hv/hv_util.c
similarity index 99%
rename from drivers/staging/hv/hv_util.c
rename to drivers/hv/hv_util.c
index faa66074cc2124012703ed0581917a3aa522629c..e0e3a6d0244d2b301f95163fcfe8538d752b2f18 100644 (file)
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/hv/hv_util.c
@@ -26,8 +26,8 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/reboot.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hv_kvp.h"
 
 

diff --git a/drivers/staging/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
similarity index 99%
rename from drivers/staging/hv/hyperv_vmbus.h
rename to drivers/hv/hyperv_vmbus.h
index 3d2d836c3cc83a0403043a81f51b74e717047759..8261cb64931b358a33b992498bdf732e260a82e3 100644 (file)
--- a/drivers/staging/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -28,8 +28,7 @@
 #include <linux/list.h>
 #include <asm/sync_bitops.h>
 #include <linux/atomic.h>
-
-#include "hyperv.h"
+#include <linux/hyperv.h>
 
 /*
  * The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent

diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/hv/ring_buffer.c
similarity index 99%
rename from drivers/staging/hv/ring_buffer.c
rename to drivers/hv/ring_buffer.c
index 70e2e66fec716d0becbaddc00d8f8a237714b3d0..f594ed09d7e022cda59e4007697ecf570e187265 100644 (file)
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/hv/ring_buffer.c
@@ -25,8 +25,8 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
similarity index 99%
rename from drivers/staging/hv/vmbus_drv.c
rename to drivers/hv/vmbus_drv.c
index d2562afcce4c46311b922a5f0cc50b22d7532e65..b0d08f980de13babb46a9c2f73539a7204e9b3be 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -32,8 +32,8 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <linux/completion.h>
+#include <linux/hyperv.h>
 
-#include "hyperv.h"
 #include "hyperv_vmbus.h"
 
 

diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
index 815f8c2f7cdcc43b2b8306608d0d4cad52d177a7..072185ebe95b4a8a3694fb4019216086893e55f7 100644 (file)
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@ -1,39 +1,17 @@
-config HYPERV
-       tristate "Microsoft Hyper-V client drivers"
-       depends on X86 && ACPI && PCI
-       default n
-       help
-         Select this option to run Linux as a Hyper-V client operating
-         system.
-
-if HYPERV
-
 config HYPERV_STORAGE
        tristate "Microsoft Hyper-V virtual storage driver"
-       depends on SCSI
-       default HYPERV
+       depends on HYPERV && SCSI
        help
         Select this option to enable the Hyper-V virtual storage driver.
 
 config HYPERV_NET
        tristate "Microsoft Hyper-V virtual network driver"
-       depends on NET
-       default HYPERV
+       depends on HYPERV && NET
        help
          Select this option to enable the Hyper-V virtual network driver.
 
-config HYPERV_UTILS
-       tristate "Microsoft Hyper-V Utilities driver"
-       depends on CONNECTOR && NLS
-       default HYPERV
-       help
-         Select this option to enable the Hyper-V Utilities.
-
 config HYPERV_MOUSE
        tristate "Microsoft Hyper-V mouse driver"
-       depends on HID
-       default HYPERV
+       depends on HYPERV && HID
        help
          Select this option to enable the Hyper-V mouse driver.
-
-endif

diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1f231e989d2b027ce60d3f357d1ace1078..e071c12c8f69b70f813aa7df773fae999a63821e 100644 (file)
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,12 +1,7 @@
-obj-$(CONFIG_HYPERV)           += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV)           += hv_timesource.o
 obj-$(CONFIG_HYPERV_STORAGE)   += hv_storvsc.o
 obj-$(CONFIG_HYPERV_NET)       += hv_netvsc.o
-obj-$(CONFIG_HYPERV_UTILS)     += hv_utils.o
 obj-$(CONFIG_HYPERV_MOUSE)     += hv_mouse.o
 
-hv_vmbus-y := vmbus_drv.o \
-                hv.o connection.o channel.o \
-                channel_mgmt.o ring_buffer.o
 hv_storvsc-y := storvsc_drv.o
 hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
-hv_utils-y := hv_util.o hv_kvp.o

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index edbb4797db758c46f192b833811652a3df64e6ce..c354ade76ef5c474383127a9d98fe42fb5c981cd 100644 (file)
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -22,8 +22,7 @@
 #include <linux/input.h>
 #include <linux/hid.h>
 #include <linux/hiddev.h>
-
-#include "hyperv.h"
+#include <linux/hyperv.h>
 
 
 struct hv_input_dev_info {

diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/staging/hv/hyperv_net.h
index 366dd2b32b13a8be5db67535f33a2fe20d0da0c3..ac1ec8405124eba477eed5214fa141084634c894 100644 (file)
--- a/drivers/staging/hv/hyperv_net.h
+++ b/drivers/staging/hv/hyperv_net.h
@@ -26,7 +26,7 @@
 #define _HYPERV_NET_H
 
 #include <linux/list.h>
-#include "hyperv.h"
+#include <linux/hyperv.h>
 
 /* Fwd declaration */
 struct hv_netvsc_packet;

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index e412716326096a3332efd25163034326082a38c1..af185abbaa738917f3984feed9b931cac11b1d70 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/hyperv.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
@@ -40,7 +41,6 @@
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
 
-#include "hyperv.h"
 
 #define STORVSC_RING_BUFFER_SIZE                       (20*PAGE_SIZE)
 static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE;

diff --git a/drivers/staging/hv/hyperv.h b/include/linux/hyperv.h
similarity index 100%
rename from drivers/staging/hv/hyperv.h
rename to include/linux/hyperv.h

diff --git a/drivers/staging/hv/tools/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
similarity index 100%
rename from drivers/staging/hv/tools/hv_kvp_daemon.c
rename to tools/hv/hv_kvp_daemon.c