From b7bb4816a083c233b49ade84cecd74b37f072ebf Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Wed, 1 Jun 2016 09:20:52 +0000 Subject: [PATCH] hyperv: Rename some cleaned up/almost cleaned up files MFC after: 1 week Sponsored by: Microsoft OSTC --- 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 ef356ea83b8e..8f0670beb41c 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -273,12 +273,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/nfe/if_nfe.c optional nfe pci dev/ntb/if_ntb/if_ntb.c optional if_ntb dev/ntb/ntb_hw/ntb_hw.c optional if_ntb | ntb_hw diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index a64a9164d89b..ed89ef376599 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -248,12 +248,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 cfbd2cf66c07..d4c7d8bb04dc 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}