[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/28] i386: kvm: extract CPUID entry lookup to cpui
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 05/28] i386: kvm: extract CPUID entry lookup to cpuid_find_entry() function |
Date: |
Wed, 31 Oct 2012 07:39:43 -0200 |
From: Eduardo Habkost <address@hidden>
No behavior change, just code movement.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 695deb9..c94897f 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -145,11 +145,28 @@ static uint32_t cpuid_entry_get_reg(struct
kvm_cpuid_entry2 *entry, int reg)
return ret;
}
+/* Find matching entry for function/index on kvm_cpuid2 struct
+ */
+static struct kvm_cpuid_entry2 *cpuid_find_entry(struct kvm_cpuid2 *cpuid,
+ uint32_t function,
+ uint32_t index)
+{
+ int i;
+ for (i = 0; i < cpuid->nent; ++i) {
+ if (cpuid->entries[i].function == function &&
+ cpuid->entries[i].index == index) {
+ return &cpuid->entries[i];
+ }
+ }
+ /* not found: */
+ return NULL;
+}
+
uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
uint32_t index, int reg)
{
struct kvm_cpuid2 *cpuid;
- int i, max;
+ int max;
uint32_t ret = 0;
uint32_t cpuid_1_edx;
bool found = false;
@@ -159,13 +176,10 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
max *= 2;
}
- for (i = 0; i < cpuid->nent; ++i) {
- if (cpuid->entries[i].function == function &&
- cpuid->entries[i].index == index) {
- struct kvm_cpuid_entry2 *entry = &cpuid->entries[i];
- found = true;
- ret = cpuid_entry_get_reg(entry, reg);
- }
+ struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index);
+ if (entry) {
+ found = true;
+ ret = cpuid_entry_get_reg(entry, reg);
}
/* Fixups for the data returned by KVM, below */
--
1.7.6.4
- [Qemu-devel] [PATCH 21/28] Use global properties to emulate -no-kvm-pit-reinjection, (continued)
- [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
- [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 <=
- [Qemu-devel] [PATCH 28/28] update-linux-headers.sh: Handle new kernel uapi/ directories, Marcelo Tosatti, 2012/10/31