[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/28] i386: kvm: x2apic is not supported without in
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 10/28] i386: kvm: x2apic is not supported without in-kernel irqchip |
Date: |
Wed, 31 Oct 2012 07:39:48 -0200 |
From: Eduardo Habkost <address@hidden>
This is necessary so that x2apic is not improperly enabled when the
in-kernel irqchip is disabled.
This won't generate a warning with "-cpu ...,check" because the current
check/enforce code is broken (it checks the host CPU data directly,
instead of using kvm_arch_get_supported_cpuid()), but it will be
eventually fixed to properly report the missing x2apic flag.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index aae8af2..4e96b04 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -209,6 +209,13 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
kvm_check_extension(s, KVM_CAP_TSC_DEADLINE_TIMER)) {
ret |= CPUID_EXT_TSC_DEADLINE_TIMER;
}
+
+ /* x2apic is reported by GET_SUPPORTED_CPUID, but it can't be enabled
+ * without the in-kernel irqchip
+ */
+ if (!kvm_irqchip_in_kernel()) {
+ ret &= ~CPUID_EXT_X2APIC;
+ }
} else if (function == 0x80000001 && reg == R_EDX) {
/* On Intel, kvm returns cpuid according to the Intel spec,
* so add missing bits according to the AMD spec:
--
1.7.6.4
- [Qemu-devel] [PATCH 15/28] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, (continued)
- [Qemu-devel] [PATCH 15/28] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 23/28] Issue warning when deprecated -tdf option is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 08/28] i386: kvm: set CPUID_EXT_HYPERVISOR on kvm_arch_get_supported_cpuid(), Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 09/28] i386: kvm: set CPUID_EXT_TSC_DEADLINE_TIMER on kvm_arch_get_supported_cpuid(), Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 13/28] i386: kvm: filter CPUID feature words earlier, on cpu.c, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 03/28] i386: kvm: kvm_arch_get_supported_cpuid: use 'entry' variable, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 11/28] i386: kvm: mask cpuid_kvm_features earlier, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 01/28] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 18/28] cirrus_vga: allow configurable vram size, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 21/28] Use global properties to emulate -no-kvm-pit-reinjection, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 10/28] i386: kvm: x2apic is not supported without in-kernel irqchip,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 24/28] Emulate qemu-kvms -no-kvm option, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 16/28] i386: cpu: add missing CPUID[EAX=7, ECX=0] flag names, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 02/28] i386: kvm: kvm_arch_get_supported_cpuid: clean up has_kvm_features check, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 22/28] Issue warning when deprecated drive parameter boot=on|off is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 20/28] Issue warning when deprecated -no-kvm-pit is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 07/28] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if', Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 25/28] target-i386: make cpu_x86_fill_host() void, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 06/28] i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 05/28] i386: kvm: extract CPUID entry lookup to cpuid_find_entry() function, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 28/28] update-linux-headers.sh: Handle new kernel uapi/ directories, Marcelo Tosatti, 2012/10/31