diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2019-04-01 08:21:05 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2019-04-01 08:21:05 +0000 |
| commit | 292584741abbb550bd957ec92d1046cdb7ecce53 (patch) | |
| tree | e915da295f58b813d19c70c92d54d04e221ce62e /sys/arch/amd64/include | |
| parent | a1f49cdfa2fa92887f8a7b94f00665aec14681e4 (diff) | |
vmm(4): Don't advertise support for MCE/MCA since we don't implement
the MSRs to support them. Fixes an OOPS during Linux guest VM boot on
Ryzen.
ok deraadt
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 2a011ccac98..33bccc2cf9b 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.61 2019/03/02 08:53:07 ajacoutot Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.62 2019/04/01 08:21:04 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -564,6 +564,7 @@ struct vm_rwregs_params { * speedstep (CPUIDECX_EST) * thermal (CPUIDECX_TM2, CPUID_ACPI, CPUID_TM) * context id (CPUIDECX_CNXTID) + * machine check (CPUID_MCE, CPUID_MCA) * silicon debug (CPUIDECX_SDBG) * xTPR (CPUIDECX_XTPR) * perf/debug (CPUIDECX_PDCM) @@ -587,7 +588,7 @@ struct vm_rwregs_params { #define VMM_CPUIDEDX_MASK ~(CPUID_ACPI | CPUID_TM | \ CPUID_HTT | CPUID_DS | CPUID_APIC | \ CPUID_PSN | CPUID_SS | CPUID_PBE | \ - CPUID_MTRR) + CPUID_MTRR | CPUID_MCE | CPUID_MCA) /* * SEFF flags - copy from host minus: |