Browse Source

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>
master
Greg Kroah-Hartman 10 years ago
parent
commit
46a9719136
  1. 2
      drivers/Kconfig
  2. 2
      drivers/Makefile
  3. 14
      drivers/hv/Kconfig
  4. 7
      drivers/hv/Makefile
  5. 2
      drivers/hv/channel.c
  6. 2
      drivers/hv/channel_mgmt.c
  7. 2
      drivers/hv/connection.c
  8. 2
      drivers/hv/hv.c
  9. 2
      drivers/hv/hv_kvp.c
  10. 0
      drivers/hv/hv_kvp.h
  11. 2
      drivers/hv/hv_util.c
  12. 3
      drivers/hv/hyperv_vmbus.h
  13. 2
      drivers/hv/ring_buffer.c
  14. 2
      drivers/hv/vmbus_drv.c
  15. 28
      drivers/staging/hv/Kconfig
  16. 7
      drivers/staging/hv/Makefile
  17. 3
      drivers/staging/hv/hv_mouse.c
  18. 2
      drivers/staging/hv/hyperv_net.h
  19. 2
      drivers/staging/hv/storvsc_drv.c
  20. 0
      include/linux/hyperv.h
  21. 0
      tools/hv/hv_kvp_daemon.c

2
drivers/Kconfig

@ -130,4 +130,6 @@ source "drivers/iommu/Kconfig"
source "drivers/virt/Kconfig"
source "drivers/hv/Kconfig"
endmenu

2
drivers/Makefile

@ -127,3 +127,5 @@ obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
# Virtualization drivers
obj-$(CONFIG_VIRT_DRIVERS) += virt/
obj-$(CONFIG_HYPERV) += hv/

14
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.

7
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

2
drivers/staging/hv/channel.c → 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) \

2
drivers/staging/hv/channel_mgmt.c → 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 {

2
drivers/staging/hv/connection.c → 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"

2
drivers/staging/hv/hv.c → 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 */

2
drivers/staging/hv/hv_kvp.c → 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"

0
drivers/staging/hv/hv_kvp.h → drivers/hv/hv_kvp.h

2
drivers/staging/hv/hv_util.c → 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"

3
drivers/staging/hv/hyperv_vmbus.h → 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

2
drivers/staging/hv/ring_buffer.c → 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"

2
drivers/staging/hv/vmbus_drv.c → 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"

28
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

7
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

3
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 {

2
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;

2
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;

0
drivers/staging/hv/hyperv.h → include/linux/hyperv.h

0
drivers/staging/hv/tools/hv_kvp_daemon.c → tools/hv/hv_kvp_daemon.c

Loading…
Cancel
Save