Module Name: src Committed By: martin Date: Wed May 13 12:21:56 UTC 2020
Modified Files: src/sys/dev/nvmm [netbsd-9]: nvmm.c nvmm_internal.h src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_svm.c nvmm_x86_vmx.c Log Message: Pull up following revision(s) (requested by maxv in ticket #898): sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.59 sys/dev/nvmm/nvmm_internal.h: revision 1.14 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.53 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.54 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.55 sys/dev/nvmm/nvmm.c: revision 1.27 sys/dev/nvmm/nvmm.c: revision 1.28 When the identification fails, print the reason. If we were processing a software int/excp, and got a VMEXIT in the middle, we must also reflect the instruction length, otherwise the next VMENTER fails and Qemu shuts the guest down. On Intel CPUs, CPUID leaf 0xB, too, provides topology information, so filter it correctly, to avoid inconsistencies if the host has SMT. This fixes HaikuOS which fetches SMT information from there and would panic because of the inconsistencies. To generate a diff of this commit: cvs rdiff -u -r1.22.2.2 -r1.22.2.3 src/sys/dev/nvmm/nvmm.c cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/nvmm/nvmm_internal.h cvs rdiff -u -r1.46.4.3 -r1.46.4.4 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.36.2.5 -r1.36.2.6 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.