[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/28] i386: kvm: kvm_arch_get_supported_cpuid: move
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 01/28] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop |
Date: |
Wed, 31 Oct 2012 07:39:39 -0200 |
From: Eduardo Habkost <address@hidden>
The for loop will become a separate function, so clean it up so it can
become independent from the bit hacking for R_EDX.
No behavior change[1], just code movement.
[1] Well, only if the kernel returned CPUID leafs 1 or 0x80000001 as
unsupported, but there's no kernel version that does that.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 3aa62b2..b7490f9 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -155,24 +155,29 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
break;
case R_EDX:
ret = cpuid->entries[i].edx;
- switch (function) {
- case 1:
- /* KVM before 2.6.30 misreports the following features */
- ret |= CPUID_MTRR | CPUID_PAT | CPUID_MCE | CPUID_MCA;
- break;
- case 0x80000001:
- /* On Intel, kvm returns cpuid according to the Intel spec,
- * so add missing bits according to the AMD spec:
- */
- cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
- ret |= cpuid_1_edx & CPUID_EXT2_AMD_ALIASES;
- break;
- }
break;
}
}
}
+ /* Fixups for the data returned by KVM, below */
+
+ if (reg == R_EDX) {
+ switch (function) {
+ case 1:
+ /* KVM before 2.6.30 misreports the following features */
+ ret |= CPUID_MTRR | CPUID_PAT | CPUID_MCE | CPUID_MCA;
+ break;
+ case 0x80000001:
+ /* On Intel, kvm returns cpuid according to the Intel spec,
+ * so add missing bits according to the AMD spec:
+ */
+ cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
+ ret |= cpuid_1_edx & CPUID_EXT2_AMD_ALIASES;
+ break;
+ }
+ }
+
g_free(cpuid);
/* fallback for older kernels */
--
1.7.6.4
- [Qemu-devel] [PATCH 04/28] i386: kvm: extract register switch to cpuid_entry_get_reg() function, (continued)
- [Qemu-devel] [PATCH 04/28] i386: kvm: extract register switch to cpuid_entry_get_reg() function, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 26/28] target-i386: cpu: make -cpu host/check/enforce code KVM-specific, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 17/28] target-i386: Add missing kvm cpuid feature name, Marcelo Tosatti, 2012/10/31
- [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 <=
- [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, 2012/10/31
- [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