From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWYP3-0005PX-LG for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWYP3-0005P7-4g for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:33 -0500 Received: from [199.232.76.173] (port=56400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWYP2-0005P0-RT for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:32 -0500 Received: from savannah.gnu.org ([199.232.41.3]:58966 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LWYP2-00055h-HW for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:32 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LWYP1-00077o-Vt for qemu-devel@nongnu.org; Mon, 09 Feb 2009 15:50:32 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LWYP1-00077k-Qh for qemu-devel@nongnu.org; Mon, 09 Feb 2009 15:50:31 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Mon, 09 Feb 2009 15:50:31 +0000 Subject: [Qemu-devel] [6566] 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: qemu-devel@nongnu.org Revision: 6566 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6566 Author: aliguori Date: 2009-02-09 15:50:31 +0000 (Mon, 09 Feb 2009) Log Message: ----------- KVM: Fetch sub-leaf cpuid values for functions 4, 0xb, 0xd. (Amit Shah) 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 Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/target-i386/kvm.c Modified: trunk/target-i386/kvm.c =================================================================== --- trunk/target-i386/kvm.c 2009-02-09 15:50:08 UTC (rev 6565) +++ trunk/target-i386/kvm.c 2009-02-09 15:50:31 UTC (rev 6566) @@ -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,46 @@ 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, 0, &eax, &ebx, &ecx, &edx); - c->function = i; - c->eax = eax; - c->ebx = ebx; - c->ecx = ecx; - c->edx = edx; + switch (i) { + case 4: + case 0xb: + case 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; + } + break; + default: + 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; + break; + } } - 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 +99,7 @@ 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)