From 448aea86cd1f64d67ff77b670e531787e9a10aec Mon Sep 17 00:00:00 2001
From: sephe <sephe@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 24 Jun 2016 02:06:13 +0000
Subject: [PATCH] MFC 301113

    hyperv: Rename some cleaned up/almost cleaned up files

    MFC after:  1 week
    Sponsored by:       Microsoft OSTC


git-svn-id: svn://svn.freebsd.org/base/stable/10@302167 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/conf/files.amd64                                |  8 ++++----
 sys/conf/files.i386                                 |  8 ++++----
 .../vmbus/amd64/{hv_vector.S => vmbus_vector.S}     |  0
 sys/dev/hyperv/vmbus/{hv_hv.c => hyperv.c}          |  0
 .../vmbus/i386/{hv_vector.S => vmbus_vector.S}      |  0
 .../vmbus/{hv_vmbus_drv_freebsd.c => vmbus.c}       |  0
 sys/dev/hyperv/vmbus/{hv_et.c => vmbus_et.c}        |  0
 sys/modules/hyperv/vmbus/Makefile                   | 13 ++++++-------
 8 files changed, 14 insertions(+), 15 deletions(-)
 rename sys/dev/hyperv/vmbus/amd64/{hv_vector.S => vmbus_vector.S} (100%)
 rename sys/dev/hyperv/vmbus/{hv_hv.c => hyperv.c} (100%)
 rename sys/dev/hyperv/vmbus/i386/{hv_vector.S => vmbus_vector.S} (100%)
 rename sys/dev/hyperv/vmbus/{hv_vmbus_drv_freebsd.c => vmbus.c} (100%)
 rename sys/dev/hyperv/vmbus/{hv_et.c => vmbus_et.c} (100%)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 15a7ea7e2..055630d68 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -274,12 +274,12 @@ dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv
 dev/hyperv/vmbus/hv_connection.c			optional	hyperv
-dev/hyperv/vmbus/hv_hv.c				optional	hyperv
-dev/hyperv/vmbus/hv_et.c				optional	hyperv
 dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
-dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
+dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
-dev/hyperv/vmbus/amd64/hv_vector.S			optional	hyperv
+dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
+dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/kbd/kbd.c			optional	atkbd | sc | ukbd | vt
 dev/lindev/full.c		optional	lindev
 dev/lindev/lindev.c		optional	lindev
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 2045c7cad..bc68d9c52 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -250,12 +250,12 @@ dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv
 dev/hyperv/vmbus/hv_connection.c			optional	hyperv
-dev/hyperv/vmbus/hv_hv.c				optional	hyperv
-dev/hyperv/vmbus/hv_et.c				optional	hyperv
 dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
-dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
+dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
-dev/hyperv/vmbus/i386/hv_vector.S			optional	hyperv
+dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
+dev/hyperv/vmbus/i386/vmbus_vector.S			optional	hyperv
 dev/ichwd/ichwd.c		optional ichwd
 dev/if_ndis/if_ndis.c		optional ndis
 dev/if_ndis/if_ndis_pccard.c	optional ndis pccard
diff --git a/sys/dev/hyperv/vmbus/amd64/hv_vector.S b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S
similarity index 100%
rename from sys/dev/hyperv/vmbus/amd64/hv_vector.S
rename to sys/dev/hyperv/vmbus/amd64/vmbus_vector.S
diff --git a/sys/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hyperv.c
similarity index 100%
rename from sys/dev/hyperv/vmbus/hv_hv.c
rename to sys/dev/hyperv/vmbus/hyperv.c
diff --git a/sys/dev/hyperv/vmbus/i386/hv_vector.S b/sys/dev/hyperv/vmbus/i386/vmbus_vector.S
similarity index 100%
rename from sys/dev/hyperv/vmbus/i386/hv_vector.S
rename to sys/dev/hyperv/vmbus/i386/vmbus_vector.S
diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/vmbus.c
similarity index 100%
rename from sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
rename to sys/dev/hyperv/vmbus/vmbus.c
diff --git a/sys/dev/hyperv/vmbus/hv_et.c b/sys/dev/hyperv/vmbus/vmbus_et.c
similarity index 100%
rename from sys/dev/hyperv/vmbus/hv_et.c
rename to sys/dev/hyperv/vmbus/vmbus_et.c
diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile
index cfbd2cf66..d4c7d8bb0 100644
--- a/sys/modules/hyperv/vmbus/Makefile
+++ b/sys/modules/hyperv/vmbus/Makefile
@@ -7,21 +7,20 @@ KMOD=	hv_vmbus
 SRCS=	hv_channel.c \
 	hv_channel_mgmt.c \
 	hv_connection.c \
-	hv_et.c \
-	hv_hv.c \
 	hv_ring_buffer.c \
-	hv_vmbus_drv_freebsd.c \
-	hv_vmbus_priv.h \
-	hyperv_busdma.c
+	hyperv.c \
+	hyperv_busdma.c \
+	vmbus.c \
+	vmbus_et.c
 SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h
 
 SRCS+=	assym.s \
-	hv_vector.S
+	vmbus_vector.S
 
-hv_vector.o:
+vmbus_vector.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
             ${.IMPSRC} -o ${.TARGET}
 
-- 
2.45.0