[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 2/6] target/i386: Drop accel_uses_host_cpuid before x86_cpu_ge
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 2/6] target/i386: Drop accel_uses_host_cpuid before x86_cpu_get_supported_cpuid |
Date: |
Wed, 13 Sep 2023 11:30:04 +0200 |
x86_cpu_get_supported_cpuid() already checks for KVM/HVF
accelerators, so it is not needed to manually check it via
a call to accel_uses_host_cpuid() before calling it.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/i386/cpu.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index bd6a932d08..94b1ba0cf1 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6207,7 +6207,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
break;
case 0xA:
/* Architectural Performance Monitoring Leaf */
- if (accel_uses_host_cpuid() && cpu->enable_pmu) {
+ if (cpu->enable_pmu) {
x86_cpu_get_supported_cpuid(0xA, count, eax, ebx, ecx, edx);
} else {
*eax = 0;
@@ -6247,8 +6247,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
*ebx &= 0xffff; /* The count doesn't need to be reliable. */
break;
case 0x1C:
- if (accel_uses_host_cpuid() && cpu->enable_pmu &&
- (env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_ARCH_LBR)) {
+ if (cpu->enable_pmu && (env->features[FEAT_7_0_EDX] &
CPUID_7_0_EDX_ARCH_LBR)) {
x86_cpu_get_supported_cpuid(0x1C, 0, eax, ebx, ecx, edx);
*edx = 0;
}
@@ -6322,9 +6321,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
} else {
*ecx &= ~XSTATE_ARCH_LBR_MASK;
}
- } else if (count == 0xf &&
- accel_uses_host_cpuid() && cpu->enable_pmu &&
- (env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_ARCH_LBR)) {
+ } else if (count == 0xf && cpu->enable_pmu
+ && (env->features[FEAT_7_0_EDX] & CPUID_7_0_EDX_ARCH_LBR)) {
x86_cpu_get_supported_cpuid(0xD, count, eax, ebx, ecx, edx);
} else if (count < ARRAY_SIZE(x86_ext_save_areas)) {
const ExtSaveArea *esa = &x86_ext_save_areas[count];
--
2.41.0
- [PATCH v5 0/6] target/i386: Restrict system-specific features from user emulation, Philippe Mathieu-Daudé, 2023/09/13
- [PATCH v5 1/6] target/i386: Check kvm_hyperv_expand_features() return value, Philippe Mathieu-Daudé, 2023/09/13
- [PATCH v5 2/6] target/i386: Drop accel_uses_host_cpuid before x86_cpu_get_supported_cpuid,
Philippe Mathieu-Daudé <=
- [PATCH v5 3/6] target/i386: Call accel-agnostic x86_cpu_get_supported_cpuid(), Philippe Mathieu-Daudé, 2023/09/13
- [PATCH v5 4/6] target/i386: Move x86_cpu_get_migratable_flags() around, Philippe Mathieu-Daudé, 2023/09/13
- [RFC PATCH v5 5/6] target/i386: Restrict system-specific code from user emulation, Philippe Mathieu-Daudé, 2023/09/13
- [PATCH v5 6/6] target/i386: Prohibit target specific KVM prototypes on user emulation, Philippe Mathieu-Daudé, 2023/09/13
- Re: [PATCH v5 0/6] target/i386: Restrict system-specific features from user emulation, Paolo Bonzini, 2023/09/13