From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LNmhy-0005yI-Ak for qemu-devel@nongnu.org; Fri, 16 Jan 2009 06:17:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LNmhx-0005xr-HT for qemu-devel@nongnu.org; Fri, 16 Jan 2009 06:17:49 -0500 Received: from [199.232.76.173] (port=36004 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LNmhx-0005xg-7T for qemu-devel@nongnu.org; Fri, 16 Jan 2009 06:17:49 -0500 Received: from mx2.redhat.com ([66.187.237.31]:43314) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LNmhw-00007G-QY for qemu-devel@nongnu.org; Fri, 16 Jan 2009 06:17:49 -0500 From: Amit Shah Date: Fri, 16 Jan 2009 16:47:47 +0530 Message-Id: <1232104667-22365-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1232104667-22365-2-git-send-email-amit.shah@redhat.com> References: <496FB0B2.9010005@us.ibm.com> <1232104667-22365-1-git-send-email-amit.shah@redhat.com> <1232104667-22365-2-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] KVM: Fetch sub-leaf cpuid values for functions 4, 0xb, 0xd. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Amit Shah , qemu-devel@nongnu.org, kvm@vger.kernel.org, avi@redhat.com CPUID functions 4, 0xb and 0xd have sub-leaf values which depend on the input value of ECX. Store these values as well. Signed-off-by: Amit Shah --- qemu/target-i386/kvm.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/qemu/target-i386/kvm.c b/qemu/target-i386/kvm.c index 7c84e24..1482a26 100644 --- a/qemu/target-i386/kvm.c +++ b/qemu/target-i386/kvm.c @@ -36,10 +36,10 @@ 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 limit, i, j, cpuid_i; uint32_t eax, ebx, ecx, edx; cpuid_i = 0; @@ -48,21 +48,41 @@ 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++]; - - cpu_x86_cpuid(env, i, 0, &eax, &ebx, &ecx, &edx); - c->function = i; - c->eax = eax; - c->ebx = ebx; - c->ecx = ecx; - c->edx = edx; + struct kvm_cpuid_entry2 *c = &cpuid_data.entries[cpuid_i++]; + + if (i == 4 || i == 0xb || i == 0xd) { + for (j = 0; ; j++) { + cpu_x86_cpuid(env, i, j, &eax, &ebx, &ecx, &edx); + c->function = i; + c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index = j; + c->eax = eax; + c->ebx = ebx; + c->ecx = ecx; + c->edx = edx; + c = &cpuid_data.entries[++cpuid_i]; + + if (i == 4 && eax == 0) + break; + if (i == 0xb && !(ecx & 0xff00)) + break; + if (i == 0xd && eax == 0) + break; + } + } else { + cpu_x86_cpuid(env, i, 0, &eax, &ebx, &ecx, &edx); + c->function = i; + c->eax = eax; + c->ebx = ebx; + c->ecx = ecx; + c->edx = edx; + } } - cpu_x86_cpuid(env, 0x80000000, 0, &eax, &ebx, &ecx, &edx); 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, 0, &eax, &ebx, &ecx, &edx); c->function = i; @@ -74,7 +94,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.6.0.6