diff options
| author | neel <neel@FreeBSD.org> | 2014-12-30 08:24:14 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2014-12-30 08:24:14 +0000 |
| commit | 9a7db864f78c4821164e142b15574dd789e438fc (patch) | |
| tree | 5ca9ce0dfb46b18acadddbaeeda0e8409ebb1eac /sys/modules | |
| parent | 6d931c08fa2abce728837379fb2549a6513f49b0 (diff) | |
| download | FreeBSD-src-9a7db864f78c4821164e142b15574dd789e438fc.zip FreeBSD-src-9a7db864f78c4821164e142b15574dd789e438fc.tar.gz | |
MFC r273375
Add support AMD processors with the SVM/AMD-V hardware extensions.
MFC r273749
Remove bhyve SVM feature printf's now that they are available in the general
CPU feature detection code.
MFC r273766
Add missing 'break' pointed out by Coverity CID 1249760.
MFC r276098
Allow ktr(4) tracing of all guest exceptions via the tunable "hw.vmm.trace_guest_exceptions"
MFC r276392
Inject #UD into the guest when it executes either 'MONITOR' or 'MWAIT' on an
AMD/SVM host.
MFC r276402
Remove "svn:mergeinfo" property that was dragged along when these files were
svn copied in r273375.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/vmm/Makefile | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 81ff005..45025a8 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -2,12 +2,14 @@ KMOD= vmm -SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h vmx_assym.h +SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h +SRCS+= vmx_assym.h svm_assym.h CFLAGS+= -DVMM_KEEP_STATS -DSMP CFLAGS+= -I${.CURDIR}/../../amd64/vmm CFLAGS+= -I${.CURDIR}/../../amd64/vmm/io CFLAGS+= -I${.CURDIR}/../../amd64/vmm/intel +CFLAGS+= -I${.CURDIR}/../../amd64/vmm/amd # generic vmm support .PATH: ${.CURDIR}/../../amd64/vmm @@ -44,9 +46,14 @@ SRCS+= ept.c \ # amd-specific files .PATH: ${.CURDIR}/../../amd64/vmm/amd -SRCS+= amdv.c - -CLEANFILES= vmx_assym.h vmx_genassym.o +SRCS+= vmcb.c \ + svm.c \ + svm_support.S \ + npt.c \ + amdv.c \ + svm_msr.c + +CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o vmx_assym.h: vmx_genassym.o .if exists(@) @@ -54,11 +61,24 @@ vmx_assym.h: @/kern/genassym.sh .endif sh @/kern/genassym.sh vmx_genassym.o > ${.TARGET} +svm_assym.h: svm_genassym.o +.if exists(@) +svm_assym.h: @/kern/genassym.sh +.endif + sh @/kern/genassym.sh svm_genassym.o > ${.TARGET} + vmx_support.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} +svm_support.o: + ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ + ${.IMPSRC} -o ${.TARGET} + vmx_genassym.o: ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} +svm_genassym.o: + ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} + .include <bsd.kmod.mk> |
