[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] i386: kvm: kvm_arch_get_supported_cpuid: repl
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 07/15] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if' |
Date: |
Thu, 4 Oct 2012 17:48:59 -0300 |
Additional fixups will be added, and making them a single 'if/else if'
chain makes it clearer than two nested switch statements.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/kvm.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7115921..084b40c 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -193,20 +193,15 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
/* 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;
- }
+ if (function == 1 && reg == R_EDX) {
+ /* KVM before 2.6.30 misreports the following features */
+ ret |= CPUID_MTRR | CPUID_PAT | CPUID_MCE | CPUID_MCA;
+ } 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:
+ */
+ cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
+ ret |= cpuid_1_edx & CPUID_EXT2_AMD_ALIASES;
}
g_free(cpuid);
--
1.7.11.4
- [Qemu-devel] [PATCH 00/15] QEMU KVM_GET_SUPPORTED_CPUID cleanups and fixes, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 01/15] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 06/15] i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 11/15] i386: kvm: mask cpuid_kvm_features earlier, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 07/15] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if',
Eduardo Habkost <=
- [Qemu-devel] [PATCH 10/15] i386: kvm: x2apic is not supported without in-kernel irqchip, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 08/15] i386: kvm: set CPUID_EXT_HYPERVISOR on kvm_arch_get_supported_cpuid(), Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 14/15] i386: kvm: reformat filter_features_for_kvm() code, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 04/15] i386: kvm: extract register switch to cpuid_entry_get_reg() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 02/15] i386: kvm: kvm_arch_get_supported_cpuid: clean up has_kvm_features check, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 15/15] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 13/15] i386: kvm: filter CPUID feature words earlier, on cpu.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 12/15] i386: kvm: mask cpuid_ext4_features bits earlier, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 05/15] i386: kvm: extract CPUID entry lookup to cpuid_find_entry() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 09/15] i386: kvm: set CPUID_EXT_TSC_DEADLINE_TIMER on kvm_arch_get_supported_cpuid(), Eduardo Habkost, 2012/10/04