diff options
| author | maxv <maxv@NetBSD.org> | 2020-05-10 06:24:16 +0000 |
|---|---|---|
| committer | maxv <maxv@NetBSD.org> | 2020-05-10 06:24:16 +0000 |
| commit | bbf2aad658581bcad2e3e28f2efb58d0f50ae1b4 (patch) | |
| tree | 56175e0d433c0c0097f190fa604b3d4dc0bd8fbb /sys/dev/nvmm | |
| parent | 7b3d7e15099be259fbfb01e5b8945f6daafc5d41 (diff) | |
Respect the convention for the hypervisor information: return the highest
hypervisor leaf in 0x40000000.EAX.
Diffstat (limited to 'sys/dev/nvmm')
| -rw-r--r-- | sys/dev/nvmm/x86/nvmm_x86_svm.c | 7 | ||||
| -rw-r--r-- | sys/dev/nvmm/x86/nvmm_x86_vmx.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/nvmm/x86/nvmm_x86_svm.c b/sys/dev/nvmm/x86/nvmm_x86_svm.c index 060a6216a31..97724bf8ea3 100644 --- a/sys/dev/nvmm/x86/nvmm_x86_svm.c +++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_svm.c,v 1.60 2020/05/09 16:18:57 maxv Exp $ */ +/* $NetBSD: nvmm_x86_svm.c,v 1.61 2020/05/10 06:24:16 maxv Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.60 2020/05/09 16:18:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.61 2020/05/10 06:24:16 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -771,6 +771,8 @@ svm_inkernel_advance(struct vmcb *vmcb) vmcb->ctrl.intr &= ~VMCB_CTRL_INTR_SHADOW; } +#define SVM_CPUID_MAX_HYPERVISOR 0x40000000 + static void svm_inkernel_handle_cpuid(struct nvmm_cpu *vcpu, uint64_t eax, uint64_t ecx) { @@ -856,6 +858,7 @@ svm_inkernel_handle_cpuid(struct nvmm_cpu *vcpu, uint64_t eax, uint64_t ecx) break; case 0x40000000: /* Hypervisor Information */ + cpudata->vmcb->state.rax = SVM_CPUID_MAX_HYPERVISOR; cpudata->gprs[NVMM_X64_GPR_RBX] = 0; cpudata->gprs[NVMM_X64_GPR_RCX] = 0; cpudata->gprs[NVMM_X64_GPR_RDX] = 0; diff --git a/sys/dev/nvmm/x86/nvmm_x86_vmx.c b/sys/dev/nvmm/x86/nvmm_x86_vmx.c index 336b5b1386d..7935728b0fc 100644 --- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c +++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_vmx.c,v 1.56 2020/05/09 16:18:57 maxv Exp $ */ +/* $NetBSD: nvmm_x86_vmx.c,v 1.57 2020/05/10 06:24:16 maxv Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.56 2020/05/09 16:18:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.57 2020/05/10 06:24:16 maxv Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1137,6 +1137,8 @@ error: vmx_exit_invalid(exit, VMCS_EXITCODE_EXC_NMI); } +#define VMX_CPUID_MAX_HYPERVISOR 0x40000000 + static void vmx_inkernel_handle_cpuid(struct nvmm_machine *mach, struct nvmm_cpu *vcpu, uint64_t eax, uint64_t ecx) @@ -1293,6 +1295,7 @@ vmx_inkernel_handle_cpuid(struct nvmm_machine *mach, struct nvmm_cpu *vcpu, break; case 0x40000000: /* Hypervisor Information */ + cpudata->gprs[NVMM_X64_GPR_RAX] = VMX_CPUID_MAX_HYPERVISOR; cpudata->gprs[NVMM_X64_GPR_RBX] = 0; cpudata->gprs[NVMM_X64_GPR_RCX] = 0; cpudata->gprs[NVMM_X64_GPR_RDX] = 0; |
