[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] Factor out common code in filling cpuid code
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 1/2] Factor out common code in filling cpuid code |
Date: |
Thu, 5 Feb 2009 10:35:06 -0500 |
Use kvm_fill_cpuid to query qemu for cpuid data. There are two exactly equal
instances of this code, and the future introduction of kvm paravirt features
will make it three.
Signed-off-by: Glauber Costa <address@hidden>
---
target-i386/kvm.c | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 49766e2..4a55931 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -33,22 +33,19 @@
do { } while (0)
#endif
-int kvm_arch_init_vcpu(CPUState *env)
+typedef struct {
+ struct kvm_cpuid cpuid;
+ struct kvm_cpuid_entry entries[100];
+} KVMCpuid;
+
+static void kvm_fill_cpuid(CPUState *env, KVMCpuid *cpuid_data,
+ uint32_t start, uint32_t limit)
{
- struct {
- struct kvm_cpuid cpuid;
- struct kvm_cpuid_entry entries[100];
- } __attribute__((packed)) cpuid_data;
- uint32_t limit, i, cpuid_i;
+ int i;
uint32_t eax, ebx, ecx, edx;
- cpuid_i = 0;
-
- cpu_x86_cpuid(env, 0, &eax, &ebx, &ecx, &edx);
- limit = eax;
-
- for (i = 0; i <= limit; i++) {
- struct kvm_cpuid_entry *c = &cpuid_data.entries[cpuid_i++];
+ for (i = start; i <= limit; i++) {
+ struct kvm_cpuid_entry *c =
&cpuid_data->entries[cpuid_data->cpuid.nent++];
cpu_x86_cpuid(env, i, &eax, &ebx, &ecx, &edx);
c->function = i;
@@ -57,22 +54,24 @@ int kvm_arch_init_vcpu(CPUState *env)
c->ecx = ecx;
c->edx = edx;
}
+}
- cpu_x86_cpuid(env, 0x80000000, &eax, &ebx, &ecx, &edx);
- limit = eax;
+int kvm_arch_init_vcpu(CPUState *env)
+{
+ KVMCpuid cpuid_data;
+ uint32_t limit;
+ uint32_t eax, ebx, ecx, edx;
- for (i = 0x80000000; i <= limit; i++) {
- struct kvm_cpuid_entry *c = &cpuid_data.entries[cpuid_i++];
+ cpuid_data.cpuid.nent = 0;
- cpu_x86_cpuid(env, i, &eax, &ebx, &ecx, &edx);
- c->function = i;
- c->eax = eax;
- c->ebx = ebx;
- c->ecx = ecx;
- c->edx = edx;
- }
+ cpu_x86_cpuid(env, 0, &eax, &ebx, &ecx, &edx);
+ limit = eax;
- cpuid_data.cpuid.nent = cpuid_i;
+ kvm_fill_cpuid(env, &cpuid_data, 0, limit);
+
+ cpu_x86_cpuid(env, 0x80000000, &eax, &ebx, &ecx, &edx);
+ limit = eax;
+ kvm_fill_cpuid(env, &cpuid_data, 0x80000000, limit);
return kvm_vcpu_ioctl(env, KVM_SET_CPUID, &cpuid_data);
}
--
1.5.6.5