[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/51] target/i386: Allow elision of kvm_enable_x2apic()
From: |
Paolo Bonzini |
Subject: |
[PULL 43/51] target/i386: Allow elision of kvm_enable_x2apic() |
Date: |
Thu, 7 Sep 2023 14:59:52 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Call kvm_enabled() before kvm_enable_x2apic() to let the compiler elide
its call. Cleanup the code by simplifying "!xen_enabled() &&
kvm_enabled()" to just "kvm_enabled()".
Suggested-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904124325.79040-8-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/i386/intel_iommu.c | 2 +-
hw/i386/x86.c | 9 +++------
target/i386/kvm/kvm-stub.c | 7 -------
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 3ca71df3693..c9961ef752c 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -4053,7 +4053,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error
**errp)
error_setg(errp, "eim=on requires accel=kvm,kernel-irqchip=split");
return false;
}
- if (!kvm_enable_x2apic()) {
+ if (kvm_enabled() && !kvm_enable_x2apic()) {
error_setg(errp, "eim=on requires support on the KVM side"
"(X2APIC_API, first shipped in v4.7)");
return false;
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index a88a126123b..3e86cf3060f 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -129,13 +129,10 @@ void x86_cpus_init(X86MachineState *x86ms, int
default_cpu_version)
ms->smp.max_cpus - 1) +
1;
/*
- * Can we support APIC ID 255 or higher?
- *
- * Under Xen: yes.
- * With userspace emulated lapic: no
- * With KVM's in-kernel lapic: only if X2APIC API is enabled.
+ * Can we support APIC ID 255 or higher? With KVM, that requires
+ * both in-kernel lapic and X2APIC userspace API.
*/
- if (x86ms->apic_id_limit > 255 && !xen_enabled() &&
+ if (x86ms->apic_id_limit > 255 && kvm_enabled() &&
(!kvm_irqchip_in_kernel() || !kvm_enable_x2apic())) {
error_report("current -smp configuration requires kernel "
"irqchip and X2APIC API support.");
diff --git a/target/i386/kvm/kvm-stub.c b/target/i386/kvm/kvm-stub.c
index f985d9a1d39..62cccebee4f 100644
--- a/target/i386/kvm/kvm-stub.c
+++ b/target/i386/kvm/kvm-stub.c
@@ -12,13 +12,6 @@
#include "qemu/osdep.h"
#include "kvm_i386.h"
-#ifndef __OPTIMIZE__
-bool kvm_enable_x2apic(void)
-{
- return false;
-}
-#endif
-
bool kvm_hv_vpindex_settable(void)
{
return false;
--
2.41.0
- [PULL 40/51] target/i386/helper: Restrict KVM declarations to system emulation, (continued)
- [PULL 40/51] target/i386/helper: Restrict KVM declarations to system emulation, Paolo Bonzini, 2023/09/07
- [PULL 46/51] sysemu/kvm: Restrict kvm_arch_get_supported_cpuid/msr() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 48/51] sysemu/kvm: Restrict kvm_has_pit_state2() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 47/51] sysemu/kvm: Restrict kvm_get_apic_state() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 42/51] target/i386: Remove unused KVM stubs, Paolo Bonzini, 2023/09/07
- [PULL 44/51] target/i386: Allow elision of kvm_hv_vpindex_settable(), Paolo Bonzini, 2023/09/07
- [PULL 51/51] docs/system/replay: do not show removed command line option, Paolo Bonzini, 2023/09/07
- [PULL 49/51] sysemu/kvm: Restrict kvm_pc_setup_irq_routing() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 50/51] subprojects: add wrap file for libblkio, Paolo Bonzini, 2023/09/07
- [PULL 45/51] target/i386: Restrict declarations specific to CONFIG_KVM, Paolo Bonzini, 2023/09/07
- [PULL 43/51] target/i386: Allow elision of kvm_enable_x2apic(),
Paolo Bonzini <=
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/07
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Kevin Wolf, 2023/09/08
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/08
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Kevin Wolf, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Stefan Hajnoczi, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Thomas Huth, 2023/09/11
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Philippe Mathieu-Daudé, 2023/09/08
- Re: [PULL 00/51] Build system, i386 changes for 2023-09-07, Kevin Wolf, 2023/09/08