diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-09-04 14:43:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-07 13:32:37 +0200 |
| commit | 9926cf34de5fa15da1d58e809692b5c7ccf72ec5 (patch) | |
| tree | b095d3f4b12f79508c9cbd1f472cc70cea109540 /hw/i386/x86.c | |
| parent | 3adce820cf9c454b49cabf52b829001ecb98500e (diff) | |
| download | focaccia-qemu-9926cf34de5fa15da1d58e809692b5c7ccf72ec5.tar.gz focaccia-qemu-9926cf34de5fa15da1d58e809692b5c7ccf72ec5.zip | |
target/i386: Allow elision of kvm_enable_x2apic()
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>
Diffstat (limited to 'hw/i386/x86.c')
| -rw-r--r-- | hw/i386/x86.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index a88a126123..3e86cf3060 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."); |