diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-18 17:30:05 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-18 17:30:05 +0000 |
| commit | b0c683a03f7c07cd7ab962acc1dcfef6ba4f78a3 (patch) | |
| tree | 1e08bb083df7937abc8bb9a07e854667fef0f244 | |
| parent | 499f455359a249f5cd686e106367ef0c71b5580a (diff) | |
| download | illumos-joyent-b0c683a03f7c07cd7ab962acc1dcfef6ba4f78a3.tar.gz | |
12665 want modern bhyve [fix broken build]
| -rw-r--r-- | exception_lists/copyright | 1 | ||||
| -rw-r--r-- | exception_lists/cstyle | 1 | ||||
| -rw-r--r-- | exception_lists/hdrchk | 1 | ||||
| -rw-r--r-- | exception_lists/wscheck | 1 | ||||
| -rw-r--r-- | usr/src/head/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/Makefile.files | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/Makefile.i86pc | 1 |
7 files changed, 1 insertions, 9 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 87c8de6ba4..354f7fb236 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -552,7 +552,6 @@ usr/src/compat/freebsd/amd64/machine/*.h usr/contrib/freebsd/*/*.h usr/contrib/freebsd/*/*/*.h usr/contrib/freebsd/lib/libutil/*.c -usr/src/head/bhyve.h usr/src/lib/libvmmapi/common/vmmapi.[ch] usr/src/tools/scripts/gensetdefs.pl usr/src/uts/i86pc/io/vmm/amd/*.[chs] diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 4da7cad3df..9a76360653 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -1421,7 +1421,6 @@ usr/src/compat/freebsd/amd64/machine/*.h usr/contrib/freebsd/*/*.h usr/contrib/freebsd/*/*/*.h usr/contrib/freebsd/lib/libutil/*.c -usr/src/head/bhyve.h usr/src/lib/libvmmapi/common/vmmapi.[ch] usr/src/uts/i86pc/io/vmm/amd/*.[ch] usr/src/uts/i86pc/io/vmm/intel/*.[chs] diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk index f4e1cf14c3..08a3179039 100644 --- a/exception_lists/hdrchk +++ b/exception_lists/hdrchk @@ -421,7 +421,6 @@ usr/src/compat/freebsd/*/*.h usr/src/compat/freebsd/amd64/machine/*.h usr/contrib/freebsd/*/*.h usr/contrib/freebsd/*/*/*.h -usr/src/head/bhyve.h usr/src/lib/libvmmapi/common/vmmapi.h usr/src/uts/i86pc/io/vmm/intel/*.h usr/src/uts/i86pc/io/vmm/io/*.h diff --git a/exception_lists/wscheck b/exception_lists/wscheck index 0a66384f9c..0e2f1164c5 100644 --- a/exception_lists/wscheck +++ b/exception_lists/wscheck @@ -83,7 +83,6 @@ usr/src/data/perfmon/readme.txt usr/contrib/freebsd/*/*.h usr/contrib/freebsd/*/*/*.h usr/contrib/freebsd/lib/libutil/*.c -usr/src/head/bhyve.h usr/src/lib/libvmmapi/common/vmmapi.[ch] usr/src/uts/i86pc/io/vmm/amd/*.[ch] usr/src/uts/i86pc/io/vmm/intel/*.[chs] diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile index 562664bde5..75e2788897 100644 --- a/usr/src/head/Makefile +++ b/usr/src/head/Makefile @@ -33,8 +33,7 @@ include ../Makefile.master sparc_HDRS= i386_HDRS= \ - stack_unwind.h \ - bhyve.h + stack_unwind.h KRB5HDRS= \ mit_copyright.h \ diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files index fe848a2f26..50b429dfe6 100644 --- a/usr/src/uts/i86pc/Makefile.files +++ b/usr/src/uts/i86pc/Makefile.files @@ -270,8 +270,6 @@ VMM_OBJS += vmm.o \ vmcb.o \ svm_support.o \ amdv.o \ - sol_iommu.o \ - sol_ppt.o \ gipt.o \ vmm_sol_vm.o \ vmm_sol_glue.o \ diff --git a/usr/src/uts/i86pc/Makefile.i86pc b/usr/src/uts/i86pc/Makefile.i86pc index fa72c89dbe..cec9d91ac8 100644 --- a/usr/src/uts/i86pc/Makefile.i86pc +++ b/usr/src/uts/i86pc/Makefile.i86pc @@ -250,7 +250,6 @@ DRV_KMODS += vmm DRV_KMODS += viona DRV_KMODS += ppt DRV_KMODS += imc imcstub -DRV_KMODS += vmm DRV_KMODS += cpudrv |