From bd4cb7ffa67970858dd2733659e5a97cb7b90b97 Mon Sep 17 00:00:00 2001 From: Shwartsman Date: Mon, 20 Nov 2023 19:10:46 +0200 Subject: [PATCH] fixed compilation without SVM configured in --- bochs/cpu/crregs.cc | 2 ++ bochs/cpu/generic_cpuid.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bochs/cpu/crregs.cc b/bochs/cpu/crregs.cc index 2436a5b1d7..e54ab69b04 100644 --- a/bochs/cpu/crregs.cc +++ b/bochs/cpu/crregs.cc @@ -1789,8 +1789,10 @@ Bit32u BX_CPU_C::get_efer_allow_mask(void) efer_allowed_mask |= (BX_EFER_SCE_MASK | BX_EFER_LME_MASK | BX_EFER_LMA_MASK); if (BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_FFXSR)) efer_allowed_mask |= BX_EFER_FFXSR_MASK; +#if BX_SUPPORT_SVM if (BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_SVM)) efer_allowed_mask |= BX_EFER_SVME_MASK; +#endif if (BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_TCE)) efer_allowed_mask |= BX_EFER_TCE_MASK; } diff --git a/bochs/cpu/generic_cpuid.cc b/bochs/cpu/generic_cpuid.cc index df1208e3ea..a83b2aaf87 100644 --- a/bochs/cpu/generic_cpuid.cc +++ b/bochs/cpu/generic_cpuid.cc @@ -69,9 +69,11 @@ bx_generic_cpuid_t::bx_generic_cpuid_t(BX_CPU_C *cpu): bx_cpuid_t(cpu) #else max_ext_leaf = 0x80000008; +#if BX_SUPPORT_SVM if (BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_SVM)) max_ext_leaf = 0x8000000A; #endif +#endif } void bx_generic_cpuid_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const