From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSFfv-0006Br-AZ for qemu-devel@nongnu.org; Wed, 28 Jan 2009 14:02:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSFft-0006Ae-Gi for qemu-devel@nongnu.org; Wed, 28 Jan 2009 14:02:10 -0500 Received: from [199.232.76.173] (port=40912 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSFft-0006A7-3x for qemu-devel@nongnu.org; Wed, 28 Jan 2009 14:02:09 -0500 Received: from mx2.redhat.com ([66.187.237.31]:51335) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LSFfs-0006f4-6H for qemu-devel@nongnu.org; Wed, 28 Jan 2009 14:02:08 -0500 From: Glauber Costa Date: Wed, 28 Jan 2009 14:02:04 -0500 Message-Id: <1233169325-5487-3-git-send-email-glommer@redhat.com> In-Reply-To: <1233169325-5487-2-git-send-email-glommer@redhat.com> References: <1233169325-5487-1-git-send-email-glommer@redhat.com> <1233169325-5487-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] convert cpuid registration to KVM_SET_CPUID2 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Use KVM_SET_CPUID2 instead of KVM_SET_CPUID. This will allow us to do registration of cpuid leaves without multiple calls to the kernel in the future. Signed-off-by: Glauber Costa --- target-i386/kvm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7f4e5aa..87ddff5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -65,13 +65,13 @@ static uint32_t get_para_features(CPUState *env) int kvm_arch_init_vcpu(CPUState *env) { struct { - struct kvm_cpuid cpuid; - struct kvm_cpuid_entry entries[100]; + struct kvm_cpuid2 cpuid; + struct kvm_cpuid_entry2 entries[100]; } __attribute__((packed)) cpuid_data; uint32_t limit, i, cpuid_i = 0; uint32_t eax, ebx, ecx, edx; #ifdef KVM_CPUID_SIGNATURE - struct kvm_cpuid_entry *pv_ent; + struct kvm_cpuid_entry2 *pv_ent; /* Paravirtualization CPUIDs */ pv_ent = &cpuid_data.entries[cpuid_i++]; @@ -93,7 +93,7 @@ int kvm_arch_init_vcpu(CPUState *env) limit = eax; for (i = 0; i <= limit; i++) { - struct kvm_cpuid_entry *c = &cpuid_data.entries[cpuid_i++]; + struct kvm_cpuid_entry2 *c = &cpuid_data.entries[cpuid_i++]; cpu_x86_cpuid(env, i, &eax, &ebx, &ecx, &edx); c->function = i; @@ -107,7 +107,7 @@ int kvm_arch_init_vcpu(CPUState *env) limit = eax; for (i = 0x80000000; i <= limit; i++) { - struct kvm_cpuid_entry *c = &cpuid_data.entries[cpuid_i++]; + struct kvm_cpuid_entry2 *c = &cpuid_data.entries[cpuid_i++]; cpu_x86_cpuid(env, i, &eax, &ebx, &ecx, &edx); c->function = i; @@ -119,7 +119,7 @@ int kvm_arch_init_vcpu(CPUState *env) cpuid_data.cpuid.nent = cpuid_i; - return kvm_vcpu_ioctl(env, KVM_SET_CPUID, &cpuid_data); + return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); } static int kvm_has_msr_star(CPUState *env) -- 1.5.6.5