diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/Makefile.master | 2 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 8 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/test/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/cmd/bhyvectl/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/README | 9 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/asmacros.h (renamed from usr/src/compat/freebsd/amd64/machine/asmacros.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/atomic.h (renamed from usr/src/compat/freebsd/amd64/machine/atomic.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/clock.h (renamed from usr/src/compat/freebsd/amd64/machine/clock.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/cpu.h (renamed from usr/src/compat/freebsd/amd64/machine/cpu.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/cpufunc.h (renamed from usr/src/compat/freebsd/amd64/machine/cpufunc.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/fpu.h (renamed from usr/src/compat/freebsd/amd64/machine/fpu.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/iodev.h (renamed from usr/src/compat/freebsd/amd64/machine/iodev.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/md_var.h (renamed from usr/src/compat/freebsd/amd64/machine/md_var.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/param.h (renamed from usr/src/compat/freebsd/amd64/machine/param.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/pcb.h (renamed from usr/src/compat/freebsd/amd64/machine/pcb.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/pmap.h (renamed from usr/src/compat/freebsd/amd64/machine/pmap.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/reg.h (renamed from usr/src/compat/freebsd/amd64/machine/reg.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/segments.h (renamed from usr/src/compat/freebsd/amd64/machine/segments.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/smp.h (renamed from usr/src/compat/freebsd/amd64/machine/smp.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/specialreg.h (renamed from usr/src/compat/freebsd/amd64/machine/specialreg.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/vmm.h (renamed from usr/src/compat/freebsd/amd64/machine/vmm.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/vmm_dev.h (renamed from usr/src/compat/freebsd/amd64/machine/vmm_dev.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/vmm_instruction_emul.h (renamed from usr/src/compat/freebsd/amd64/machine/vmm_instruction_emul.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/amd64/machine/vmparam.h (renamed from usr/src/compat/freebsd/amd64/machine/vmparam.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/contrib/dev/acpica/include/acpi.h (renamed from usr/src/compat/freebsd/contrib/dev/acpica/include/acpi.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/dev/pci/pcivar.h (renamed from usr/src/compat/freebsd/dev/pci/pcivar.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/err.h (renamed from usr/src/compat/freebsd/err.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/libutil.h (renamed from usr/src/compat/freebsd/libutil.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/net/ethernet.h (renamed from usr/src/compat/freebsd/net/ethernet.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/net/ieee_oui.h (renamed from usr/src/compat/freebsd/net/ieee_oui.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/paths.h (renamed from usr/src/compat/freebsd/paths.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/pthread_np.h (renamed from usr/src/compat/freebsd/pthread_np.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/string.h (renamed from usr/src/compat/freebsd/string.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/strings.h (renamed from usr/src/compat/freebsd/strings.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/_cpuset.h (renamed from usr/src/compat/freebsd/sys/_cpuset.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/_iovec.h (renamed from usr/src/compat/freebsd/sys/_iovec.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/_pthreadtypes.h (renamed from usr/src/compat/freebsd/sys/_pthreadtypes.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/_types.h (renamed from usr/src/compat/freebsd/sys/_types.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/bus.h (renamed from usr/src/compat/freebsd/sys/bus.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/callout.h (renamed from usr/src/compat/freebsd/sys/callout.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/cdefs.h (renamed from usr/src/compat/freebsd/sys/cdefs.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/clock.h (renamed from usr/src/compat/freebsd/sys/clock.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/cpuset.h (renamed from usr/src/compat/freebsd/sys/cpuset.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/disk.h (renamed from usr/src/compat/freebsd/sys/disk.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/endian.h (renamed from usr/src/compat/freebsd/sys/endian.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/errno.h (renamed from usr/src/compat/freebsd/sys/errno.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/eventhandler.h (renamed from usr/src/compat/freebsd/sys/eventhandler.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/fcntl.h (renamed from usr/src/compat/freebsd/sys/fcntl.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/ioctl.h (renamed from usr/src/compat/freebsd/sys/ioctl.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/kernel.h (renamed from usr/src/compat/freebsd/sys/kernel.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/ktr.h (renamed from usr/src/compat/freebsd/sys/ktr.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/libkern.h (renamed from usr/src/compat/freebsd/sys/libkern.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/limits.h (renamed from usr/src/compat/freebsd/sys/limits.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/lock.h (renamed from usr/src/compat/freebsd/sys/lock.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/malloc.h (renamed from usr/src/compat/freebsd/sys/malloc.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/module.h (renamed from usr/src/compat/freebsd/sys/module.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/mutex.h (renamed from usr/src/compat/freebsd/sys/mutex.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/param.h (renamed from usr/src/compat/freebsd/sys/param.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/pcpu.h (renamed from usr/src/compat/freebsd/sys/pcpu.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/sched.h (renamed from usr/src/compat/freebsd/sys/sched.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/sdt.h (renamed from usr/src/compat/freebsd/sys/sdt.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/select.h (renamed from usr/src/compat/freebsd/sys/select.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/sglist.h (renamed from usr/src/compat/freebsd/sys/sglist.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/smp.h (renamed from usr/src/compat/freebsd/sys/smp.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/socket.h (renamed from usr/src/compat/freebsd/sys/socket.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/sysctl.h (renamed from usr/src/compat/freebsd/sys/sysctl.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/systm.h (renamed from usr/src/compat/freebsd/sys/systm.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/time.h (renamed from usr/src/compat/freebsd/sys/time.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/types.h (renamed from usr/src/compat/freebsd/sys/types.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/sys/uio.h (renamed from usr/src/compat/freebsd/sys/uio.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/termios.h (renamed from usr/src/compat/freebsd/termios.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/unistd.h (renamed from usr/src/compat/freebsd/unistd.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/uuid.h (renamed from usr/src/compat/freebsd/uuid.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/vm/vm.h (renamed from usr/src/compat/freebsd/vm/vm.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/vm/vm_param.h (renamed from usr/src/compat/freebsd/vm/vm_param.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/x86/_types.h (renamed from usr/src/compat/freebsd/x86/_types.h) | 0 | ||||
| -rw-r--r-- | usr/src/compat/bhyve/x86/segments.h (renamed from usr/src/compat/freebsd/x86/segments.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/README | 12 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/amd64/machine/_types.h (renamed from usr/contrib/freebsd/amd64/machine/_types.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/amd64/machine/pmap.h (renamed from usr/contrib/freebsd/amd64/machine/pmap.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/amd64/machine/psl.h (renamed from usr/contrib/freebsd/amd64/machine/psl.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/amd64/machine/timerreg.h (renamed from usr/contrib/freebsd/amd64/machine/timerreg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/amd64/machine/vm.h (renamed from usr/contrib/freebsd/amd64/machine/vm.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/acpica/acpi_hpet.h (renamed from usr/contrib/freebsd/dev/acpica/acpi_hpet.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/ic/i8253reg.h (renamed from usr/contrib/freebsd/dev/ic/i8253reg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/ic/i8259.h (renamed from usr/contrib/freebsd/dev/ic/i8259.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/ic/ns16550.h (renamed from usr/contrib/freebsd/dev/ic/ns16550.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/io/iodev.h (renamed from usr/contrib/freebsd/dev/io/iodev.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/mii/mii.h (renamed from usr/contrib/freebsd/dev/mii/mii.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/nvme/nvme.h (renamed from usr/contrib/freebsd/dev/nvme/nvme.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/pci/pcireg.h (renamed from usr/contrib/freebsd/dev/pci/pcireg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/usb/controller/xhcireg.h (renamed from usr/contrib/freebsd/dev/usb/controller/xhcireg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/usb/usb.h (renamed from usr/contrib/freebsd/dev/usb/usb.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/usb/usb_endian.h (renamed from usr/contrib/freebsd/dev/usb/usb_endian.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/usb/usb_freebsd.h (renamed from usr/contrib/freebsd/dev/usb/usb_freebsd.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/dev/usb/usbdi.h (renamed from usr/contrib/freebsd/dev/usb/usbdi.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/isa/isareg.h (renamed from usr/contrib/freebsd/isa/isareg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/isa/rtc.h (renamed from usr/contrib/freebsd/isa/rtc.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/lib/libutil/expand_number.c (renamed from usr/contrib/freebsd/lib/libutil/expand_number.c) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/lib/libutil/humanize_number.c (renamed from usr/contrib/freebsd/lib/libutil/humanize_number.c) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/sys/ata.h (renamed from usr/contrib/freebsd/sys/ata.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/sys/pciio.h (renamed from usr/contrib/freebsd/sys/pciio.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/sys/queue.h (renamed from usr/contrib/freebsd/sys/queue.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/sys/tree.h (renamed from usr/contrib/freebsd/sys/tree.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/apicreg.h (renamed from usr/contrib/freebsd/x86/apicreg.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/mptable.h (renamed from usr/contrib/freebsd/x86/mptable.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/psl.h (renamed from usr/contrib/freebsd/x86/psl.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/segments.h (renamed from usr/contrib/freebsd/x86/segments.h) | 0 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/specialreg.h (renamed from usr/contrib/freebsd/x86/specialreg.h) | 0 | ||||
| -rw-r--r-- | usr/src/lib/libvmm/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libvmmapi/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libvmmapi/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/req.flg | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/ppt/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/vmm/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/req.flg | 4 |
116 files changed, 44 insertions, 25 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 568e36b841..39f02b2ea0 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -61,7 +61,7 @@ NATIVE_ADJUNCT= /usr # Compatibility code for FreeBSD etc. # COMPAT= $(SRC)/compat -CONTRIB= $(SRC)/../contrib +CONTRIB= $(SRC)/contrib # # RELEASE_BUILD should be cleared for final release builds. diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index f9e8605b4e..4cff9d9cf9 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -107,10 +107,10 @@ MEVENT_TEST_OBJS = $(MEVENT_TEST_SRCS:.c=.o) CLEANFILES = $(PROG) $(MEVENT_TEST_PROG) $(MEVENT_TEST_OBJS) CFLAGS += $(CCVERBOSE) -_gcc=-Wimplicit-function-declaration -_gcc=-Wno-parentheses -CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ - -I$(COMPAT)/freebsd/amd64 -I$(CONTRIB)/freebsd/amd64 \ - -I$(CONTRIB)/freebsd/dev/usb/controller \ - -I$(CONTRIB)/freebsd/dev/mii \ +CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ + -I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 \ + -I$(CONTRIB)/bhyve/dev/usb/controller \ + -I$(CONTRIB)/bhyve/dev/mii \ -I$(SRC)/uts/common/io/e1000api \ $(CPPFLAGS.master) \ -I$(SRC)/uts/i86pc/io/vmm \ diff --git a/usr/src/cmd/bhyve/test/Makefile.com b/usr/src/cmd/bhyve/test/Makefile.com index a1a2d79db1..a2e5bce08f 100644 --- a/usr/src/cmd/bhyve/test/Makefile.com +++ b/usr/src/cmd/bhyve/test/Makefile.com @@ -28,16 +28,16 @@ CFLAGS += $(CCVERBOSE) -_gcc=-Wimplicit-function-declaration \ CFLAGS64 += $(CCVERBOSE) -_gcc=-Wimplicit-function-declaration \ -_gcc=-Wno-parentheses CPPFLAGS = -I$(SRC)/cmd/bhyve \ - -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ - -I$(CONTRIB)/freebsd/dev/usb/controller \ - -I$(CONTRIB)/freebsd/dev/mii \ + -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ + -I$(CONTRIB)/bhyve/dev/usb/controller \ + -I$(CONTRIB)/bhyve/dev/mii \ $(CPPFLAGS.master) \ -I$(SRC)/uts/i86pc/io/vmm \ -I$(SRC)/uts/common \ -I$(SRC)/uts/i86pc \ -I$(SRC)/lib/libdladm/common \ -DWITHOUT_CAPSICUM -CPPFLAGS += -I$(COMPAT)/freebsd/amd64 -I$(CONTRIB)/freebsd/amd64 +CPPFLAGS += -I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 SMOFF += all_func_returns diff --git a/usr/src/cmd/bhyvectl/Makefile b/usr/src/cmd/bhyvectl/Makefile index bbac3dd0cc..01d331c823 100644 --- a/usr/src/cmd/bhyvectl/Makefile +++ b/usr/src/cmd/bhyvectl/Makefile @@ -28,8 +28,8 @@ CLOBBERFILES += $(ROOTUSRSBINPROG) .KEEP_STATE: CFLAGS += $(CCVERBOSE) -CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ - -I$(COMPAT)/freebsd/amd64 -I$(CONTRIB)/freebsd/amd64 \ +CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ + -I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 \ $(CPPFLAGS.master) \ -I$(SRC)/uts/i86pc/io/vmm \ -I$(SRC)/uts/i86pc @@ -53,6 +53,6 @@ clean: include ../Makefile.targ -%.o: $(CONTRIB)/freebsd/lib/libutil/%.c +%.o: $(CONTRIB)/bhyve/lib/libutil/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/compat/bhyve/README b/usr/src/compat/bhyve/README new file mode 100644 index 0000000000..87ceb83695 --- /dev/null +++ b/usr/src/compat/bhyve/README @@ -0,0 +1,9 @@ +These are the compatibility headers for building bhyve on illumos. They are +comprised of the shims and glue needed to use native functionality as the +backing for FreeBSD interfaces. It often means heavy use of #include_next, +#define renames, and forward definitions to some glue functions. + +For headers which would otherwise be copied verbatim from FreeBSD, the +usr/src/contrib/bhyve area is the appropriate home. This allows us to carry +only the bare minimum in the 'compat' headers while making updates for the +'contrib' headers easy (simply copy over the new version). diff --git a/usr/src/compat/freebsd/amd64/machine/asmacros.h b/usr/src/compat/bhyve/amd64/machine/asmacros.h index 1f6955130b..1f6955130b 100644 --- a/usr/src/compat/freebsd/amd64/machine/asmacros.h +++ b/usr/src/compat/bhyve/amd64/machine/asmacros.h diff --git a/usr/src/compat/freebsd/amd64/machine/atomic.h b/usr/src/compat/bhyve/amd64/machine/atomic.h index 1da9724b7d..1da9724b7d 100644 --- a/usr/src/compat/freebsd/amd64/machine/atomic.h +++ b/usr/src/compat/bhyve/amd64/machine/atomic.h diff --git a/usr/src/compat/freebsd/amd64/machine/clock.h b/usr/src/compat/bhyve/amd64/machine/clock.h index f50b42a126..f50b42a126 100644 --- a/usr/src/compat/freebsd/amd64/machine/clock.h +++ b/usr/src/compat/bhyve/amd64/machine/clock.h diff --git a/usr/src/compat/freebsd/amd64/machine/cpu.h b/usr/src/compat/bhyve/amd64/machine/cpu.h index 40253af108..40253af108 100644 --- a/usr/src/compat/freebsd/amd64/machine/cpu.h +++ b/usr/src/compat/bhyve/amd64/machine/cpu.h diff --git a/usr/src/compat/freebsd/amd64/machine/cpufunc.h b/usr/src/compat/bhyve/amd64/machine/cpufunc.h index 0b7bcdaa59..0b7bcdaa59 100644 --- a/usr/src/compat/freebsd/amd64/machine/cpufunc.h +++ b/usr/src/compat/bhyve/amd64/machine/cpufunc.h diff --git a/usr/src/compat/freebsd/amd64/machine/fpu.h b/usr/src/compat/bhyve/amd64/machine/fpu.h index 6bc651d996..6bc651d996 100644 --- a/usr/src/compat/freebsd/amd64/machine/fpu.h +++ b/usr/src/compat/bhyve/amd64/machine/fpu.h diff --git a/usr/src/compat/freebsd/amd64/machine/iodev.h b/usr/src/compat/bhyve/amd64/machine/iodev.h index c7cdddc817..c7cdddc817 100644 --- a/usr/src/compat/freebsd/amd64/machine/iodev.h +++ b/usr/src/compat/bhyve/amd64/machine/iodev.h diff --git a/usr/src/compat/freebsd/amd64/machine/md_var.h b/usr/src/compat/bhyve/amd64/machine/md_var.h index ed57a8bebc..ed57a8bebc 100644 --- a/usr/src/compat/freebsd/amd64/machine/md_var.h +++ b/usr/src/compat/bhyve/amd64/machine/md_var.h diff --git a/usr/src/compat/freebsd/amd64/machine/param.h b/usr/src/compat/bhyve/amd64/machine/param.h index b152f4d526..b152f4d526 100644 --- a/usr/src/compat/freebsd/amd64/machine/param.h +++ b/usr/src/compat/bhyve/amd64/machine/param.h diff --git a/usr/src/compat/freebsd/amd64/machine/pcb.h b/usr/src/compat/bhyve/amd64/machine/pcb.h index 75b5de640c..75b5de640c 100644 --- a/usr/src/compat/freebsd/amd64/machine/pcb.h +++ b/usr/src/compat/bhyve/amd64/machine/pcb.h diff --git a/usr/src/compat/freebsd/amd64/machine/pmap.h b/usr/src/compat/bhyve/amd64/machine/pmap.h index ce3185629b..ce3185629b 100644 --- a/usr/src/compat/freebsd/amd64/machine/pmap.h +++ b/usr/src/compat/bhyve/amd64/machine/pmap.h diff --git a/usr/src/compat/freebsd/amd64/machine/reg.h b/usr/src/compat/bhyve/amd64/machine/reg.h index 4a73463603..4a73463603 100644 --- a/usr/src/compat/freebsd/amd64/machine/reg.h +++ b/usr/src/compat/bhyve/amd64/machine/reg.h diff --git a/usr/src/compat/freebsd/amd64/machine/segments.h b/usr/src/compat/bhyve/amd64/machine/segments.h index d0655f4a0e..d0655f4a0e 100644 --- a/usr/src/compat/freebsd/amd64/machine/segments.h +++ b/usr/src/compat/bhyve/amd64/machine/segments.h diff --git a/usr/src/compat/freebsd/amd64/machine/smp.h b/usr/src/compat/bhyve/amd64/machine/smp.h index 9c4f2d111b..9c4f2d111b 100644 --- a/usr/src/compat/freebsd/amd64/machine/smp.h +++ b/usr/src/compat/bhyve/amd64/machine/smp.h diff --git a/usr/src/compat/freebsd/amd64/machine/specialreg.h b/usr/src/compat/bhyve/amd64/machine/specialreg.h index ead63aaaab..ead63aaaab 100644 --- a/usr/src/compat/freebsd/amd64/machine/specialreg.h +++ b/usr/src/compat/bhyve/amd64/machine/specialreg.h diff --git a/usr/src/compat/freebsd/amd64/machine/vmm.h b/usr/src/compat/bhyve/amd64/machine/vmm.h index 1c54c0830d..1c54c0830d 100644 --- a/usr/src/compat/freebsd/amd64/machine/vmm.h +++ b/usr/src/compat/bhyve/amd64/machine/vmm.h diff --git a/usr/src/compat/freebsd/amd64/machine/vmm_dev.h b/usr/src/compat/bhyve/amd64/machine/vmm_dev.h index fe9cb6c705..fe9cb6c705 100644 --- a/usr/src/compat/freebsd/amd64/machine/vmm_dev.h +++ b/usr/src/compat/bhyve/amd64/machine/vmm_dev.h diff --git a/usr/src/compat/freebsd/amd64/machine/vmm_instruction_emul.h b/usr/src/compat/bhyve/amd64/machine/vmm_instruction_emul.h index 02c3f391c7..02c3f391c7 100644 --- a/usr/src/compat/freebsd/amd64/machine/vmm_instruction_emul.h +++ b/usr/src/compat/bhyve/amd64/machine/vmm_instruction_emul.h diff --git a/usr/src/compat/freebsd/amd64/machine/vmparam.h b/usr/src/compat/bhyve/amd64/machine/vmparam.h index c76a3259f3..c76a3259f3 100644 --- a/usr/src/compat/freebsd/amd64/machine/vmparam.h +++ b/usr/src/compat/bhyve/amd64/machine/vmparam.h diff --git a/usr/src/compat/freebsd/contrib/dev/acpica/include/acpi.h b/usr/src/compat/bhyve/contrib/dev/acpica/include/acpi.h index 2668f98ab3..2668f98ab3 100644 --- a/usr/src/compat/freebsd/contrib/dev/acpica/include/acpi.h +++ b/usr/src/compat/bhyve/contrib/dev/acpica/include/acpi.h diff --git a/usr/src/compat/freebsd/dev/pci/pcivar.h b/usr/src/compat/bhyve/dev/pci/pcivar.h index 064d983117..064d983117 100644 --- a/usr/src/compat/freebsd/dev/pci/pcivar.h +++ b/usr/src/compat/bhyve/dev/pci/pcivar.h diff --git a/usr/src/compat/freebsd/err.h b/usr/src/compat/bhyve/err.h index 40d144e025..40d144e025 100644 --- a/usr/src/compat/freebsd/err.h +++ b/usr/src/compat/bhyve/err.h diff --git a/usr/src/compat/freebsd/libutil.h b/usr/src/compat/bhyve/libutil.h index f899d4425e..f899d4425e 100644 --- a/usr/src/compat/freebsd/libutil.h +++ b/usr/src/compat/bhyve/libutil.h diff --git a/usr/src/compat/freebsd/net/ethernet.h b/usr/src/compat/bhyve/net/ethernet.h index dcd3a58925..dcd3a58925 100644 --- a/usr/src/compat/freebsd/net/ethernet.h +++ b/usr/src/compat/bhyve/net/ethernet.h diff --git a/usr/src/compat/freebsd/net/ieee_oui.h b/usr/src/compat/bhyve/net/ieee_oui.h index 068328d833..068328d833 100644 --- a/usr/src/compat/freebsd/net/ieee_oui.h +++ b/usr/src/compat/bhyve/net/ieee_oui.h diff --git a/usr/src/compat/freebsd/paths.h b/usr/src/compat/bhyve/paths.h index e43c963f93..e43c963f93 100644 --- a/usr/src/compat/freebsd/paths.h +++ b/usr/src/compat/bhyve/paths.h diff --git a/usr/src/compat/freebsd/pthread_np.h b/usr/src/compat/bhyve/pthread_np.h index c4f76b259c..c4f76b259c 100644 --- a/usr/src/compat/freebsd/pthread_np.h +++ b/usr/src/compat/bhyve/pthread_np.h diff --git a/usr/src/compat/freebsd/string.h b/usr/src/compat/bhyve/string.h index 7e0f5c7ddc..7e0f5c7ddc 100644 --- a/usr/src/compat/freebsd/string.h +++ b/usr/src/compat/bhyve/string.h diff --git a/usr/src/compat/freebsd/strings.h b/usr/src/compat/bhyve/strings.h index fa3539fb96..fa3539fb96 100644 --- a/usr/src/compat/freebsd/strings.h +++ b/usr/src/compat/bhyve/strings.h diff --git a/usr/src/compat/freebsd/sys/_cpuset.h b/usr/src/compat/bhyve/sys/_cpuset.h index 286d26fc00..286d26fc00 100644 --- a/usr/src/compat/freebsd/sys/_cpuset.h +++ b/usr/src/compat/bhyve/sys/_cpuset.h diff --git a/usr/src/compat/freebsd/sys/_iovec.h b/usr/src/compat/bhyve/sys/_iovec.h index b755ae7e21..b755ae7e21 100644 --- a/usr/src/compat/freebsd/sys/_iovec.h +++ b/usr/src/compat/bhyve/sys/_iovec.h diff --git a/usr/src/compat/freebsd/sys/_pthreadtypes.h b/usr/src/compat/bhyve/sys/_pthreadtypes.h index d746da3712..d746da3712 100644 --- a/usr/src/compat/freebsd/sys/_pthreadtypes.h +++ b/usr/src/compat/bhyve/sys/_pthreadtypes.h diff --git a/usr/src/compat/freebsd/sys/_types.h b/usr/src/compat/bhyve/sys/_types.h index 62c327d216..62c327d216 100644 --- a/usr/src/compat/freebsd/sys/_types.h +++ b/usr/src/compat/bhyve/sys/_types.h diff --git a/usr/src/compat/freebsd/sys/bus.h b/usr/src/compat/bhyve/sys/bus.h index e3b5e0e69d..e3b5e0e69d 100644 --- a/usr/src/compat/freebsd/sys/bus.h +++ b/usr/src/compat/bhyve/sys/bus.h diff --git a/usr/src/compat/freebsd/sys/callout.h b/usr/src/compat/bhyve/sys/callout.h index 11823e6321..11823e6321 100644 --- a/usr/src/compat/freebsd/sys/callout.h +++ b/usr/src/compat/bhyve/sys/callout.h diff --git a/usr/src/compat/freebsd/sys/cdefs.h b/usr/src/compat/bhyve/sys/cdefs.h index 0b857437e3..0b857437e3 100644 --- a/usr/src/compat/freebsd/sys/cdefs.h +++ b/usr/src/compat/bhyve/sys/cdefs.h diff --git a/usr/src/compat/freebsd/sys/clock.h b/usr/src/compat/bhyve/sys/clock.h index ebf7f171a3..ebf7f171a3 100644 --- a/usr/src/compat/freebsd/sys/clock.h +++ b/usr/src/compat/bhyve/sys/clock.h diff --git a/usr/src/compat/freebsd/sys/cpuset.h b/usr/src/compat/bhyve/sys/cpuset.h index 626b323d7d..626b323d7d 100644 --- a/usr/src/compat/freebsd/sys/cpuset.h +++ b/usr/src/compat/bhyve/sys/cpuset.h diff --git a/usr/src/compat/freebsd/sys/disk.h b/usr/src/compat/bhyve/sys/disk.h index c9bdc6a2d8..c9bdc6a2d8 100644 --- a/usr/src/compat/freebsd/sys/disk.h +++ b/usr/src/compat/bhyve/sys/disk.h diff --git a/usr/src/compat/freebsd/sys/endian.h b/usr/src/compat/bhyve/sys/endian.h index 24ea02d251..24ea02d251 100644 --- a/usr/src/compat/freebsd/sys/endian.h +++ b/usr/src/compat/bhyve/sys/endian.h diff --git a/usr/src/compat/freebsd/sys/errno.h b/usr/src/compat/bhyve/sys/errno.h index bd37f43065..bd37f43065 100644 --- a/usr/src/compat/freebsd/sys/errno.h +++ b/usr/src/compat/bhyve/sys/errno.h diff --git a/usr/src/compat/freebsd/sys/eventhandler.h b/usr/src/compat/bhyve/sys/eventhandler.h index 133aa664f0..133aa664f0 100644 --- a/usr/src/compat/freebsd/sys/eventhandler.h +++ b/usr/src/compat/bhyve/sys/eventhandler.h diff --git a/usr/src/compat/freebsd/sys/fcntl.h b/usr/src/compat/bhyve/sys/fcntl.h index 062a3b84ac..062a3b84ac 100644 --- a/usr/src/compat/freebsd/sys/fcntl.h +++ b/usr/src/compat/bhyve/sys/fcntl.h diff --git a/usr/src/compat/freebsd/sys/ioctl.h b/usr/src/compat/bhyve/sys/ioctl.h index 72a46b8085..72a46b8085 100644 --- a/usr/src/compat/freebsd/sys/ioctl.h +++ b/usr/src/compat/bhyve/sys/ioctl.h diff --git a/usr/src/compat/freebsd/sys/kernel.h b/usr/src/compat/bhyve/sys/kernel.h index adf96f40fc..adf96f40fc 100644 --- a/usr/src/compat/freebsd/sys/kernel.h +++ b/usr/src/compat/bhyve/sys/kernel.h diff --git a/usr/src/compat/freebsd/sys/ktr.h b/usr/src/compat/bhyve/sys/ktr.h index 96c499ef18..96c499ef18 100644 --- a/usr/src/compat/freebsd/sys/ktr.h +++ b/usr/src/compat/bhyve/sys/ktr.h diff --git a/usr/src/compat/freebsd/sys/libkern.h b/usr/src/compat/bhyve/sys/libkern.h index 94675a0d66..94675a0d66 100644 --- a/usr/src/compat/freebsd/sys/libkern.h +++ b/usr/src/compat/bhyve/sys/libkern.h diff --git a/usr/src/compat/freebsd/sys/limits.h b/usr/src/compat/bhyve/sys/limits.h index 0e66319791..0e66319791 100644 --- a/usr/src/compat/freebsd/sys/limits.h +++ b/usr/src/compat/bhyve/sys/limits.h diff --git a/usr/src/compat/freebsd/sys/lock.h b/usr/src/compat/bhyve/sys/lock.h index fd6021a87e..fd6021a87e 100644 --- a/usr/src/compat/freebsd/sys/lock.h +++ b/usr/src/compat/bhyve/sys/lock.h diff --git a/usr/src/compat/freebsd/sys/malloc.h b/usr/src/compat/bhyve/sys/malloc.h index 341d57b807..341d57b807 100644 --- a/usr/src/compat/freebsd/sys/malloc.h +++ b/usr/src/compat/bhyve/sys/malloc.h diff --git a/usr/src/compat/freebsd/sys/module.h b/usr/src/compat/bhyve/sys/module.h index 87b73e3fa3..87b73e3fa3 100644 --- a/usr/src/compat/freebsd/sys/module.h +++ b/usr/src/compat/bhyve/sys/module.h diff --git a/usr/src/compat/freebsd/sys/mutex.h b/usr/src/compat/bhyve/sys/mutex.h index 9e588cb98a..9e588cb98a 100644 --- a/usr/src/compat/freebsd/sys/mutex.h +++ b/usr/src/compat/bhyve/sys/mutex.h diff --git a/usr/src/compat/freebsd/sys/param.h b/usr/src/compat/bhyve/sys/param.h index 5ba21a2809..5ba21a2809 100644 --- a/usr/src/compat/freebsd/sys/param.h +++ b/usr/src/compat/bhyve/sys/param.h diff --git a/usr/src/compat/freebsd/sys/pcpu.h b/usr/src/compat/bhyve/sys/pcpu.h index 1bad53c159..1bad53c159 100644 --- a/usr/src/compat/freebsd/sys/pcpu.h +++ b/usr/src/compat/bhyve/sys/pcpu.h diff --git a/usr/src/compat/freebsd/sys/sched.h b/usr/src/compat/bhyve/sys/sched.h index b426ee757e..b426ee757e 100644 --- a/usr/src/compat/freebsd/sys/sched.h +++ b/usr/src/compat/bhyve/sys/sched.h diff --git a/usr/src/compat/freebsd/sys/sdt.h b/usr/src/compat/bhyve/sys/sdt.h index 32d887c0d8..32d887c0d8 100644 --- a/usr/src/compat/freebsd/sys/sdt.h +++ b/usr/src/compat/bhyve/sys/sdt.h diff --git a/usr/src/compat/freebsd/sys/select.h b/usr/src/compat/bhyve/sys/select.h index fcb40c23b1..fcb40c23b1 100644 --- a/usr/src/compat/freebsd/sys/select.h +++ b/usr/src/compat/bhyve/sys/select.h diff --git a/usr/src/compat/freebsd/sys/sglist.h b/usr/src/compat/bhyve/sys/sglist.h index 519c67915f..519c67915f 100644 --- a/usr/src/compat/freebsd/sys/sglist.h +++ b/usr/src/compat/bhyve/sys/sglist.h diff --git a/usr/src/compat/freebsd/sys/smp.h b/usr/src/compat/bhyve/sys/smp.h index 3d6413ce16..3d6413ce16 100644 --- a/usr/src/compat/freebsd/sys/smp.h +++ b/usr/src/compat/bhyve/sys/smp.h diff --git a/usr/src/compat/freebsd/sys/socket.h b/usr/src/compat/bhyve/sys/socket.h index 3bf7a8f440..3bf7a8f440 100644 --- a/usr/src/compat/freebsd/sys/socket.h +++ b/usr/src/compat/bhyve/sys/socket.h diff --git a/usr/src/compat/freebsd/sys/sysctl.h b/usr/src/compat/bhyve/sys/sysctl.h index 9f6a695e34..9f6a695e34 100644 --- a/usr/src/compat/freebsd/sys/sysctl.h +++ b/usr/src/compat/bhyve/sys/sysctl.h diff --git a/usr/src/compat/freebsd/sys/systm.h b/usr/src/compat/bhyve/sys/systm.h index 43fa16d450..43fa16d450 100644 --- a/usr/src/compat/freebsd/sys/systm.h +++ b/usr/src/compat/bhyve/sys/systm.h diff --git a/usr/src/compat/freebsd/sys/time.h b/usr/src/compat/bhyve/sys/time.h index 4e0fbfc02c..4e0fbfc02c 100644 --- a/usr/src/compat/freebsd/sys/time.h +++ b/usr/src/compat/bhyve/sys/time.h diff --git a/usr/src/compat/freebsd/sys/types.h b/usr/src/compat/bhyve/sys/types.h index 63731da42e..63731da42e 100644 --- a/usr/src/compat/freebsd/sys/types.h +++ b/usr/src/compat/bhyve/sys/types.h diff --git a/usr/src/compat/freebsd/sys/uio.h b/usr/src/compat/bhyve/sys/uio.h index 05c6f2a028..05c6f2a028 100644 --- a/usr/src/compat/freebsd/sys/uio.h +++ b/usr/src/compat/bhyve/sys/uio.h diff --git a/usr/src/compat/freebsd/termios.h b/usr/src/compat/bhyve/termios.h index feaa705358..feaa705358 100644 --- a/usr/src/compat/freebsd/termios.h +++ b/usr/src/compat/bhyve/termios.h diff --git a/usr/src/compat/freebsd/unistd.h b/usr/src/compat/bhyve/unistd.h index b4357e1da5..b4357e1da5 100644 --- a/usr/src/compat/freebsd/unistd.h +++ b/usr/src/compat/bhyve/unistd.h diff --git a/usr/src/compat/freebsd/uuid.h b/usr/src/compat/bhyve/uuid.h index 72ef2c7787..72ef2c7787 100644 --- a/usr/src/compat/freebsd/uuid.h +++ b/usr/src/compat/bhyve/uuid.h diff --git a/usr/src/compat/freebsd/vm/vm.h b/usr/src/compat/bhyve/vm/vm.h index f5bb7b6eb8..f5bb7b6eb8 100644 --- a/usr/src/compat/freebsd/vm/vm.h +++ b/usr/src/compat/bhyve/vm/vm.h diff --git a/usr/src/compat/freebsd/vm/vm_param.h b/usr/src/compat/bhyve/vm/vm_param.h index fd76b62a37..fd76b62a37 100644 --- a/usr/src/compat/freebsd/vm/vm_param.h +++ b/usr/src/compat/bhyve/vm/vm_param.h diff --git a/usr/src/compat/freebsd/x86/_types.h b/usr/src/compat/bhyve/x86/_types.h index 8bbae549d8..8bbae549d8 100644 --- a/usr/src/compat/freebsd/x86/_types.h +++ b/usr/src/compat/bhyve/x86/_types.h diff --git a/usr/src/compat/freebsd/x86/segments.h b/usr/src/compat/bhyve/x86/segments.h index 11edc582b5..11edc582b5 100644 --- a/usr/src/compat/freebsd/x86/segments.h +++ b/usr/src/compat/bhyve/x86/segments.h diff --git a/usr/src/contrib/bhyve/README b/usr/src/contrib/bhyve/README new file mode 100644 index 0000000000..415048d584 --- /dev/null +++ b/usr/src/contrib/bhyve/README @@ -0,0 +1,12 @@ +These are headers (and sources) contributed directly from FreeBSD which are +required to build bhyve. Updates are made to our copies here when corresponding +updates to bhyve require them. + +With few exceptions (noted below) they are verbatim copies taken from the +FreeBSD source tree. Files requiring extensive modification are likely a +candidate to exist as a shim in usr/src/compat/bhyve. Conversely, if only a +tiny modification is needed to make a file suitable for contrib, that trade-off +is probably worthwhile (if done with a '#ifdef _FreeBSD_' guard for clarity). + +Files modified for compatibility: +- isa/rtc.h diff --git a/usr/contrib/freebsd/amd64/machine/_types.h b/usr/src/contrib/bhyve/amd64/machine/_types.h index 59994352b5..59994352b5 100644 --- a/usr/contrib/freebsd/amd64/machine/_types.h +++ b/usr/src/contrib/bhyve/amd64/machine/_types.h diff --git a/usr/contrib/freebsd/amd64/machine/pmap.h b/usr/src/contrib/bhyve/amd64/machine/pmap.h index a0b8ee37f2..a0b8ee37f2 100644 --- a/usr/contrib/freebsd/amd64/machine/pmap.h +++ b/usr/src/contrib/bhyve/amd64/machine/pmap.h diff --git a/usr/contrib/freebsd/amd64/machine/psl.h b/usr/src/contrib/bhyve/amd64/machine/psl.h index c660bfbab0..c660bfbab0 100644 --- a/usr/contrib/freebsd/amd64/machine/psl.h +++ b/usr/src/contrib/bhyve/amd64/machine/psl.h diff --git a/usr/contrib/freebsd/amd64/machine/timerreg.h b/usr/src/contrib/bhyve/amd64/machine/timerreg.h index bca7b4dd19..bca7b4dd19 100644 --- a/usr/contrib/freebsd/amd64/machine/timerreg.h +++ b/usr/src/contrib/bhyve/amd64/machine/timerreg.h diff --git a/usr/contrib/freebsd/amd64/machine/vm.h b/usr/src/contrib/bhyve/amd64/machine/vm.h index 885c1607ea..885c1607ea 100644 --- a/usr/contrib/freebsd/amd64/machine/vm.h +++ b/usr/src/contrib/bhyve/amd64/machine/vm.h diff --git a/usr/contrib/freebsd/dev/acpica/acpi_hpet.h b/usr/src/contrib/bhyve/dev/acpica/acpi_hpet.h index df817b7a2b..df817b7a2b 100644 --- a/usr/contrib/freebsd/dev/acpica/acpi_hpet.h +++ b/usr/src/contrib/bhyve/dev/acpica/acpi_hpet.h diff --git a/usr/contrib/freebsd/dev/ic/i8253reg.h b/usr/src/contrib/bhyve/dev/ic/i8253reg.h index 47568b3436..47568b3436 100644 --- a/usr/contrib/freebsd/dev/ic/i8253reg.h +++ b/usr/src/contrib/bhyve/dev/ic/i8253reg.h diff --git a/usr/contrib/freebsd/dev/ic/i8259.h b/usr/src/contrib/bhyve/dev/ic/i8259.h index be523c1df4..be523c1df4 100644 --- a/usr/contrib/freebsd/dev/ic/i8259.h +++ b/usr/src/contrib/bhyve/dev/ic/i8259.h diff --git a/usr/contrib/freebsd/dev/ic/ns16550.h b/usr/src/contrib/bhyve/dev/ic/ns16550.h index 5e8f30e3e8..5e8f30e3e8 100644 --- a/usr/contrib/freebsd/dev/ic/ns16550.h +++ b/usr/src/contrib/bhyve/dev/ic/ns16550.h diff --git a/usr/contrib/freebsd/dev/io/iodev.h b/usr/src/contrib/bhyve/dev/io/iodev.h index d040fcccf4..d040fcccf4 100644 --- a/usr/contrib/freebsd/dev/io/iodev.h +++ b/usr/src/contrib/bhyve/dev/io/iodev.h diff --git a/usr/contrib/freebsd/dev/mii/mii.h b/usr/src/contrib/bhyve/dev/mii/mii.h index fa1ec84eaa..fa1ec84eaa 100644 --- a/usr/contrib/freebsd/dev/mii/mii.h +++ b/usr/src/contrib/bhyve/dev/mii/mii.h diff --git a/usr/contrib/freebsd/dev/nvme/nvme.h b/usr/src/contrib/bhyve/dev/nvme/nvme.h index c7f6496426..c7f6496426 100644 --- a/usr/contrib/freebsd/dev/nvme/nvme.h +++ b/usr/src/contrib/bhyve/dev/nvme/nvme.h diff --git a/usr/contrib/freebsd/dev/pci/pcireg.h b/usr/src/contrib/bhyve/dev/pci/pcireg.h index 32a569dbd4..32a569dbd4 100644 --- a/usr/contrib/freebsd/dev/pci/pcireg.h +++ b/usr/src/contrib/bhyve/dev/pci/pcireg.h diff --git a/usr/contrib/freebsd/dev/usb/controller/xhcireg.h b/usr/src/contrib/bhyve/dev/usb/controller/xhcireg.h index 0e588ecba3..0e588ecba3 100644 --- a/usr/contrib/freebsd/dev/usb/controller/xhcireg.h +++ b/usr/src/contrib/bhyve/dev/usb/controller/xhcireg.h diff --git a/usr/contrib/freebsd/dev/usb/usb.h b/usr/src/contrib/bhyve/dev/usb/usb.h index bcea2ac8bd..bcea2ac8bd 100644 --- a/usr/contrib/freebsd/dev/usb/usb.h +++ b/usr/src/contrib/bhyve/dev/usb/usb.h diff --git a/usr/contrib/freebsd/dev/usb/usb_endian.h b/usr/src/contrib/bhyve/dev/usb/usb_endian.h index 0bbcb9bf82..0bbcb9bf82 100644 --- a/usr/contrib/freebsd/dev/usb/usb_endian.h +++ b/usr/src/contrib/bhyve/dev/usb/usb_endian.h diff --git a/usr/contrib/freebsd/dev/usb/usb_freebsd.h b/usr/src/contrib/bhyve/dev/usb/usb_freebsd.h index 3bc9d2c1eb..3bc9d2c1eb 100644 --- a/usr/contrib/freebsd/dev/usb/usb_freebsd.h +++ b/usr/src/contrib/bhyve/dev/usb/usb_freebsd.h diff --git a/usr/contrib/freebsd/dev/usb/usbdi.h b/usr/src/contrib/bhyve/dev/usb/usbdi.h index 202ad89fa7..202ad89fa7 100644 --- a/usr/contrib/freebsd/dev/usb/usbdi.h +++ b/usr/src/contrib/bhyve/dev/usb/usbdi.h diff --git a/usr/contrib/freebsd/isa/isareg.h b/usr/src/contrib/bhyve/isa/isareg.h index e83e34674f..e83e34674f 100644 --- a/usr/contrib/freebsd/isa/isareg.h +++ b/usr/src/contrib/bhyve/isa/isareg.h diff --git a/usr/contrib/freebsd/isa/rtc.h b/usr/src/contrib/bhyve/isa/rtc.h index bb964ddf6a..bb964ddf6a 100644 --- a/usr/contrib/freebsd/isa/rtc.h +++ b/usr/src/contrib/bhyve/isa/rtc.h diff --git a/usr/contrib/freebsd/lib/libutil/expand_number.c b/usr/src/contrib/bhyve/lib/libutil/expand_number.c index f3b4da89f9..f3b4da89f9 100644 --- a/usr/contrib/freebsd/lib/libutil/expand_number.c +++ b/usr/src/contrib/bhyve/lib/libutil/expand_number.c diff --git a/usr/contrib/freebsd/lib/libutil/humanize_number.c b/usr/src/contrib/bhyve/lib/libutil/humanize_number.c index 675a969aaa..675a969aaa 100644 --- a/usr/contrib/freebsd/lib/libutil/humanize_number.c +++ b/usr/src/contrib/bhyve/lib/libutil/humanize_number.c diff --git a/usr/contrib/freebsd/sys/ata.h b/usr/src/contrib/bhyve/sys/ata.h index 223bd7b3eb..223bd7b3eb 100644 --- a/usr/contrib/freebsd/sys/ata.h +++ b/usr/src/contrib/bhyve/sys/ata.h diff --git a/usr/contrib/freebsd/sys/pciio.h b/usr/src/contrib/bhyve/sys/pciio.h index d70bfbcf6f..d70bfbcf6f 100644 --- a/usr/contrib/freebsd/sys/pciio.h +++ b/usr/src/contrib/bhyve/sys/pciio.h diff --git a/usr/contrib/freebsd/sys/queue.h b/usr/src/contrib/bhyve/sys/queue.h index f26c492af1..f26c492af1 100644 --- a/usr/contrib/freebsd/sys/queue.h +++ b/usr/src/contrib/bhyve/sys/queue.h diff --git a/usr/contrib/freebsd/sys/tree.h b/usr/src/contrib/bhyve/sys/tree.h index 6b47e247bb..6b47e247bb 100644 --- a/usr/contrib/freebsd/sys/tree.h +++ b/usr/src/contrib/bhyve/sys/tree.h diff --git a/usr/contrib/freebsd/x86/apicreg.h b/usr/src/contrib/bhyve/x86/apicreg.h index 24006e2733..24006e2733 100644 --- a/usr/contrib/freebsd/x86/apicreg.h +++ b/usr/src/contrib/bhyve/x86/apicreg.h diff --git a/usr/contrib/freebsd/x86/mptable.h b/usr/src/contrib/bhyve/x86/mptable.h index 8f3c62a295..8f3c62a295 100644 --- a/usr/contrib/freebsd/x86/mptable.h +++ b/usr/src/contrib/bhyve/x86/mptable.h diff --git a/usr/contrib/freebsd/x86/psl.h b/usr/src/contrib/bhyve/x86/psl.h index 6934b4feb7..6934b4feb7 100644 --- a/usr/contrib/freebsd/x86/psl.h +++ b/usr/src/contrib/bhyve/x86/psl.h diff --git a/usr/contrib/freebsd/x86/segments.h b/usr/src/contrib/bhyve/x86/segments.h index 1b8c4a3c1c..1b8c4a3c1c 100644 --- a/usr/contrib/freebsd/x86/segments.h +++ b/usr/src/contrib/bhyve/x86/segments.h diff --git a/usr/contrib/freebsd/x86/specialreg.h b/usr/src/contrib/bhyve/x86/specialreg.h index f528bad55c..f528bad55c 100644 --- a/usr/contrib/freebsd/x86/specialreg.h +++ b/usr/src/contrib/bhyve/x86/specialreg.h diff --git a/usr/src/lib/libvmm/Makefile.com b/usr/src/lib/libvmm/Makefile.com index bef555aed3..ab0e7bd2b8 100644 --- a/usr/src/lib/libvmm/Makefile.com +++ b/usr/src/lib/libvmm/Makefile.com @@ -27,8 +27,8 @@ LIBS = $(DYNLIB) # The FreeBSD compat and contrib headers need to be first in the search # path, hence we can't just append them to CPPFLAGS. So we assign CPPFLAGS # directly and pull in CPPFLAGS.master at the appropriate place. -CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ - -I$(COMPAT)/freebsd/amd64 -I$(CONTRIB)/freebsd/amd64 \ +CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ + -I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 \ $(CPPFLAGS.master) -I$(SRC)/uts/i86pc LDLIBS += -lc -lvmmapi diff --git a/usr/src/lib/libvmmapi/Makefile.com b/usr/src/lib/libvmmapi/Makefile.com index 1653e8619c..4c1c74d5a0 100644 --- a/usr/src/lib/libvmmapi/Makefile.com +++ b/usr/src/lib/libvmmapi/Makefile.com @@ -29,7 +29,7 @@ SRCDIR = ../common LIBS = $(DYNLIB) -CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ +CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ $(CPPFLAGS.master) -I$(SRC)/uts/i86pc # not linted @@ -41,7 +41,7 @@ LDLIBS += -lc all: $(LIBS) -pics/%.o: $(CONTRIB)/freebsd/lib/libutil/%.c +pics/%.o: $(CONTRIB)/bhyve/lib/libutil/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libvmmapi/amd64/Makefile b/usr/src/lib/libvmmapi/amd64/Makefile index b5cac1ffce..d777b9d456 100644 --- a/usr/src/lib/libvmmapi/amd64/Makefile +++ b/usr/src/lib/libvmmapi/amd64/Makefile @@ -16,6 +16,6 @@ include ../Makefile.com include ../../Makefile.lib.64 -CPPFLAGS += -I$(COMPAT)/freebsd/amd64 -I$(CONTRIB)/freebsd/amd64 +CPPFLAGS += -I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/req.flg b/usr/src/req.flg index 26415fa51f..9c992b1120 100644 --- a/usr/src/req.flg +++ b/usr/src/req.flg @@ -33,5 +33,3 @@ echo_file usr/src/Makefile.master.64 echo_file usr/src/Makefile.msg.targ echo_file usr/src/Makefile.psm echo_file usr/src/Makefile.psm.targ - -find_files "s.*" usr/contrib/freebsd diff --git a/usr/src/uts/i86pc/ppt/Makefile b/usr/src/uts/i86pc/ppt/Makefile index 7c41368efd..7c10482e98 100644 --- a/usr/src/uts/i86pc/ppt/Makefile +++ b/usr/src/uts/i86pc/ppt/Makefile @@ -44,8 +44,8 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -PRE_INC_PATH = -I$(COMPAT)/freebsd -I$(COMPAT)/freebsd/amd64 \ - -I$(CONTRIB)/freebsd -I$(CONTRIB)/freebsd/amd64 +PRE_INC_PATH = -I$(COMPAT)/bhyve -I$(COMPAT)/bhyve/amd64 \ + -I$(CONTRIB)/bhyve -I$(CONTRIB)/bhyve/amd64 INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(UTSBASE)/i86pc/io/vmm/io AS_INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(OBJS_DIR) diff --git a/usr/src/uts/i86pc/vmm/Makefile b/usr/src/uts/i86pc/vmm/Makefile index c55abf6090..e7f07c4c4e 100644 --- a/usr/src/uts/i86pc/vmm/Makefile +++ b/usr/src/uts/i86pc/vmm/Makefile @@ -56,8 +56,8 @@ $(OBJS_DIR)/vmx.o := SMOFF += deref_check ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -PRE_INC_PATH = -I$(COMPAT)/freebsd -I$(COMPAT)/freebsd/amd64 \ - -I$(CONTRIB)/freebsd -I$(CONTRIB)/freebsd/amd64 +PRE_INC_PATH = -I$(COMPAT)/bhyve -I$(COMPAT)/bhyve/amd64 \ + -I$(CONTRIB)/bhyve -I$(CONTRIB)/bhyve/amd64 INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(UTSBASE)/i86pc/io/vmm/io AS_INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(OBJS_DIR) diff --git a/usr/src/uts/req.flg b/usr/src/uts/req.flg index 15085a486d..76b8de8999 100644 --- a/usr/src/uts/req.flg +++ b/usr/src/uts/req.flg @@ -38,7 +38,6 @@ echo_file usr/src/Makefile # For full builds (open and closed), we want both etc/certs and # etc/keys. For an open source build, there's no etc/keys directory. -find_files "s.*" usr/contrib/freebsd find_files "s.*" usr/src/cmd/cmd-crypto/etc find_files "s.*" usr/src/common/acl find_files "s.*" usr/src/common/atomic @@ -58,5 +57,6 @@ find_files "s.*" usr/src/common/smbios find_files "s.*" usr/src/common/tsol find_files "s.*" usr/src/common/util find_files "s.*" usr/src/common/zfs -find_files "s.*" usr/src/compat/freebsd +find_files "s.*" usr/src/compat/bhyve +find_files "s.*" usr/src/contrib/bhyve find_files "s.*" usr/src/psm/promif |