diff options
author | grehan <grehan@FreeBSD.org> | 2013-07-17 06:30:23 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2013-07-17 06:30:23 +0000 |
commit | c8195f5331ccad33ad4e265362523f51b96abd5c (patch) | |
tree | 5b7b0a05acafc6450fb27259d1c1d5008e1f88f4 | |
parent | 6a7baaf83640e0eaa135d2f7a3c1d4401f1683bf (diff) | |
download | FreeBSD-src-c8195f5331ccad33ad4e265362523f51b96abd5c.zip FreeBSD-src-c8195f5331ccad33ad4e265362523f51b96abd5c.tar.gz |
Microsoft have changed their policy on how the hyper-v code will
be pulled into FreeBSD. From now, FreeBSD will be considered the
upstream repo.
First step: move the drivers away from the contrib area and into
the base system.
A follow-on commit will include the drivers in the amd64 GENERIC kernel.
-rw-r--r-- | sys/dev/hyperv/README (renamed from sys/contrib/dev/hyperv/README) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/include/hyperv.h (renamed from sys/contrib/dev/hyperv/include/hyperv.h) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_net_vsc.c (renamed from sys/contrib/dev/hyperv/netvsc/hv_net_vsc.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_net_vsc.h (renamed from sys/contrib/dev/hyperv/netvsc/hv_net_vsc.h) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c (renamed from sys/contrib/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_rndis.h (renamed from sys/contrib/dev/hyperv/netvsc/hv_rndis.h) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_rndis_filter.c (renamed from sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/netvsc/hv_rndis_filter.h (renamed from sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.h) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c (renamed from sys/contrib/dev/hyperv/stordisengage/hv_ata_pci_disengage.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c (renamed from sys/contrib/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/storvsc/hv_vstorage.h (renamed from sys/contrib/dev/hyperv/storvsc/hv_vstorage.h) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/utilities/hv_util.c (renamed from sys/contrib/dev/hyperv/utilities/hv_util.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_channel.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_channel.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_channel_mgmt.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_channel_mgmt.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_connection.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_connection.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_hv.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_hv.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_ring_buffer.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_ring_buffer.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c (renamed from sys/contrib/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c) | 0 | ||||
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_vmbus_priv.h (renamed from sys/contrib/dev/hyperv/vmbus/hv_vmbus_priv.h) | 0 | ||||
-rw-r--r-- | sys/modules/hyperv/netvsc/Makefile | 5 | ||||
-rw-r--r-- | sys/modules/hyperv/stordisengage/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/hyperv/storvsc/Makefile | 9 | ||||
-rw-r--r-- | sys/modules/hyperv/utilities/Makefile | 7 | ||||
-rw-r--r-- | sys/modules/hyperv/vmbus/Makefile | 11 |
24 files changed, 16 insertions, 20 deletions
diff --git a/sys/contrib/dev/hyperv/README b/sys/dev/hyperv/README index 1c4488d..1c4488d 100644 --- a/sys/contrib/dev/hyperv/README +++ b/sys/dev/hyperv/README diff --git a/sys/contrib/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h index 3651269..3651269 100644 --- a/sys/contrib/dev/hyperv/include/hyperv.h +++ b/sys/dev/hyperv/include/hyperv.h diff --git a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.c b/sys/dev/hyperv/netvsc/hv_net_vsc.c index aeee94d..aeee94d 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.c +++ b/sys/dev/hyperv/netvsc/hv_net_vsc.c diff --git a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.h b/sys/dev/hyperv/netvsc/hv_net_vsc.h index f7e7d00..f7e7d00 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.h +++ b/sys/dev/hyperv/netvsc/hv_net_vsc.h diff --git a/sys/contrib/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c index 47f48dd..47f48dd 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c +++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis.h b/sys/dev/hyperv/netvsc/hv_rndis.h index 819cab5..819cab5 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_rndis.h +++ b/sys/dev/hyperv/netvsc/hv_rndis.h diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.c b/sys/dev/hyperv/netvsc/hv_rndis_filter.c index 691cf7e..691cf7e 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.c +++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.c diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.h b/sys/dev/hyperv/netvsc/hv_rndis_filter.h index edbb347..edbb347 100644 --- a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.h +++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.h diff --git a/sys/contrib/dev/hyperv/stordisengage/hv_ata_pci_disengage.c b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c index 2fdf9d4..2fdf9d4 100644 --- a/sys/contrib/dev/hyperv/stordisengage/hv_ata_pci_disengage.c +++ b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c diff --git a/sys/contrib/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index c89f42e..c89f42e 100644 --- a/sys/contrib/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c diff --git a/sys/contrib/dev/hyperv/storvsc/hv_vstorage.h b/sys/dev/hyperv/storvsc/hv_vstorage.h index d01d084..d01d084 100644 --- a/sys/contrib/dev/hyperv/storvsc/hv_vstorage.h +++ b/sys/dev/hyperv/storvsc/hv_vstorage.h diff --git a/sys/contrib/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c index 9ad4370..9ad4370 100644 --- a/sys/contrib/dev/hyperv/utilities/hv_util.c +++ b/sys/dev/hyperv/utilities/hv_util.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_channel.c b/sys/dev/hyperv/vmbus/hv_channel.c index 17dfd76..17dfd76 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_channel.c +++ b/sys/dev/hyperv/vmbus/hv_channel.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_channel_mgmt.c b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c index 011e305..011e305 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_channel_mgmt.c +++ b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_connection.c b/sys/dev/hyperv/vmbus/hv_connection.c index c8e0b48..c8e0b48 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_connection.c +++ b/sys/dev/hyperv/vmbus/hv_connection.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hv_hv.c index 0e73bdc..0e73bdc 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_hv.c +++ b/sys/dev/hyperv/vmbus/hv_hv.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_ring_buffer.c b/sys/dev/hyperv/vmbus/hv_ring_buffer.c index f7c1965..f7c1965 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_ring_buffer.c +++ b/sys/dev/hyperv/vmbus/hv_ring_buffer.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c index e010308..e010308 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c +++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c diff --git a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_priv.h b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h index 739acb1..739acb1 100644 --- a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_priv.h +++ b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile index 900c1a0..cf89826 100644 --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/hyperv/netvsc +.PATH: ${.CURDIR}/../../../dev/hyperv/netvsc KMOD = hv_netvsc @@ -9,7 +9,6 @@ SRCS = hv_net_vsc.c \ hv_rndis_filter.c CFLAGS += -I${.CURDIR}/../../../contrib/dev/hyperv/include \ - -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc \ - -I${.CURDIR}/../../../contrib + -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/stordisengage/Makefile b/sys/modules/hyperv/stordisengage/Makefile index 0f3a680..41e359e 100644 --- a/sys/modules/hyperv/stordisengage/Makefile +++ b/sys/modules/hyperv/stordisengage/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/hyperv/stordisengage +.PATH: ${.CURDIR}/../../../dev/hyperv/stordisengage KMOD= hv_ata_pci_disengage -SRCS = hv_ata_pci_disengage.c +SRCS= hv_ata_pci_disengage.c .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile index da98a6e..5d19884 100644 --- a/sys/modules/hyperv/storvsc/Makefile +++ b/sys/modules/hyperv/storvsc/Makefile @@ -1,15 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/hyperv/storvsc +.PATH: ${.CURDIR}/../../../dev/hyperv/storvsc KMOD= hv_storvsc SRCS = hv_storvsc_drv_freebsd.c \ hv_vstorage.h -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \ - -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \ - -I${.CURDIR}/../../../contrib/dev/hyperv/storvsc \ - -I${.CURDIR}/../../../contrib +CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ + -I${.CURDIR}/../../../dev/hyperv/vmbus \ + -I${.CURDIR}/../../../dev/hyperv/storvsc .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile index 388182c..e2351a3 100644 --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/hyperv/utilities +.PATH: ${.CURDIR}/../../../dev/hyperv/utilities KMOD= hv_utils SRCS = hv_util.c -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \ - -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \ - -I${.CURDIR}/../../../contrib +CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ + -I${.CURDIR}/../../../dev/hyperv/vmbus .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index ab5a6ea..df8464e 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/hyperv/vmbus \ - ${.CURDIR}/../../../contrib/dev/hyperv/utilities +.PATH: ${.CURDIR}/../../../dev/hyperv/vmbus \ + ${.CURDIR}/../../../dev/hyperv/utilities KMOD= hv_vmbus @@ -13,9 +13,8 @@ SRCS = hv_channel.c \ hv_vmbus_drv_freebsd.c \ hv_vmbus_priv.h -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \ - -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \ - -I${.CURDIR}/../../../contrib/dev/hyperv/utilities \ - -I${.CURDIR}/../../../contrib +CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ + -I${.CURDIR}/../../../dev/hyperv/vmbus \ + -I${.CURDIR}/../../../dev/hyperv/utilities .include <bsd.kmod.mk> |