diff options
| author | Eduardo Habkost | 2012-10-04 22:48:59 +0200 |
|---|---|---|
| committer | Marcelo Tosatti | 2012-10-31 02:39:47 +0100 |
| commit | c2acb022c83fbaf7fdd7ab9538d44ae6e0e94f94 (patch) | |
| tree | c7f34ff54c629bf60faa2c71639939bc3f961aec /target-i386/kvm.c | |
| parent | i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function (diff) | |
| download | qemu-c2acb022c83fbaf7fdd7ab9538d44ae6e0e94f94.tar.gz qemu-c2acb022c83fbaf7fdd7ab9538d44ae6e0e94f94.tar.xz qemu-c2acb022c83fbaf7fdd7ab9538d44ae6e0e94f94.zip | |
i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if'
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 <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386/kvm.c')
| -rw-r--r-- | target-i386/kvm.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d74dbc152c..1f943c5c5a 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); |