From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M2X1Y-0000PX-7i for qemu-devel@nongnu.org; Fri, 08 May 2009 16:50:28 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M2X1T-0000Je-AB for qemu-devel@nongnu.org; Fri, 08 May 2009 16:50:27 -0400 Received: from [199.232.76.173] (port=44467 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M2X1T-0000JR-21 for qemu-devel@nongnu.org; Fri, 08 May 2009 16:50:23 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:44200) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M2X1S-0002be-Ku for qemu-devel@nongnu.org; Fri, 08 May 2009 16:50:22 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e9.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n48Kd8Pn005398 for ; Fri, 8 May 2009 16:39:08 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n48KoLrA177956 for ; Fri, 8 May 2009 16:50:21 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n48KoKME007295 for ; Fri, 8 May 2009 16:50:21 -0400 Message-ID: <4A049B0B.9030405@us.ibm.com> Date: Fri, 08 May 2009 15:50:19 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1241359444-8538-1-git-send-email-avi@redhat.com> <1241359444-8538-2-git-send-email-avi@redhat.com> In-Reply-To: <1241359444-8538-2-git-send-email-avi@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 1/4] kvm: Add support for querying supported cpu features List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Avi Kivity wrote: > kvm does not support all cpu features; add support for dunamically querying > the supported feature set. > > Signed-off-by: Avi Kivity > --- > kvm.h | 3 ++ > target-i386/kvm.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 83 insertions(+), 0 deletions(-) > > diff --git a/kvm.h b/kvm.h > index bd4e8d4..c134c45 100644 > --- a/kvm.h > +++ b/kvm.h > @@ -124,6 +124,9 @@ void kvm_arch_remove_all_hw_breakpoints(void); > > void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg); > > +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, > + int reg); > + > /* generic hooks - to be moved/refactored once there are more users */ > > static inline void cpu_synchronize_state(CPUState *env, int modified) > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index b534b2d..5f54ff5 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -34,6 +34,86 @@ > do { } while (0) > #endif > > +#ifdef KVM_CAP_EXT_CPUID > + > +static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > +{ > + struct kvm_cpuid2 *cpuid; > + int r, size; > + > + size = sizeof(*cpuid) + max * sizeof(*cpuid->entries); > + cpuid = (struct kvm_cpuid2 *)qemu_mallocz(size); > + cpuid->nent = max; > + r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); > + if (r < 0) { > + if (r == -E2BIG) { > + qemu_free(cpuid); > + return NULL; > + } else { > + fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n", > + strerror(-r)); > + exit(1); > + } > + } > + return cpuid; > +} > + > +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) > +{ > + struct kvm_cpuid2 *cpuid; > + int i, max; > + uint32_t ret = 0; > + uint32_t cpuid_1_edx; > + > + if (!kvm_check_extension(KVM_CAP_EXT_CPUID)) { > + return -1U; > + kvm_check_extension doesn't exist in upstream QEMU. It's a good idea though so I added it in a previous commit. However, I changed the signature to it to take a KVMState * as the first argument (which is available in env->kvm_state). I updated this patch to pass the extra 's' parameter. Regards, Anthony Liguori -- Regards, Anthony Liguori