From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSaYA-0001NX-SR for qemu-devel@nongnu.org; Thu, 29 Jan 2009 12:19:34 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSaY9-0001MK-7w for qemu-devel@nongnu.org; Thu, 29 Jan 2009 12:19:33 -0500 Received: from [199.232.76.173] (port=51477 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSaY8-0001Lr-W4 for qemu-devel@nongnu.org; Thu, 29 Jan 2009 12:19:33 -0500 Received: from mx2.redhat.com ([66.187.237.31]:53015) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LSaY8-0007qa-9w for qemu-devel@nongnu.org; Thu, 29 Jan 2009 12:19:32 -0500 From: Glauber Costa Date: Thu, 29 Jan 2009 12:19:26 -0500 Message-Id: <1233249569-16686-2-git-send-email-glommer@redhat.com> In-Reply-To: <1233249569-16686-1-git-send-email-glommer@redhat.com> References: <1233249569-16686-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] 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 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 2412ae4..729568c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -36,8 +36,8 @@ 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; uint32_t eax, ebx, ecx, edx; @@ -48,7 +48,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; @@ -62,7 +62,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; @@ -74,7 +74,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