From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M3qM2-0000xh-Do for qemu-devel@nongnu.org; Tue, 12 May 2009 07:41:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M3qLx-0000xP-D7 for qemu-devel@nongnu.org; Tue, 12 May 2009 07:41:01 -0400 Received: from [199.232.76.173] (port=44166 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M3qLx-0000xM-9X for qemu-devel@nongnu.org; Tue, 12 May 2009 07:40:57 -0400 Received: from mail04.svc.cra.dublin.eircom.net ([159.134.118.20]:48541) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1M3qLw-0003eu-U0 for qemu-devel@nongnu.org; Tue, 12 May 2009 07:40:57 -0400 From: Mark McLoughlin Date: Tue, 12 May 2009 12:40:54 +0100 Message-Id: <1242128454-19078-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH] kvm: work around supported cpuid ioctl() brokenness List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Mark McLoughlin , qemu-devel@nongnu.org, Avi Kivity KVM_GET_SUPPORTED_CPUID has been known to fail to return -E2BIG when it runs out of entries. Detect this by always trying again with a bigger table if the ioctl() fills the table. Signed-off-by: Mark McLoughlin --- target-i386/kvm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fe67eed..d2e1651 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -45,6 +45,8 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) cpuid = (struct kvm_cpuid2 *)qemu_mallocz(size); cpuid->nent = max; r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); + if (r == 0 && cpuid->nent >= max) + r = -E2BIG; if (r < 0) { if (r == -E2BIG) { qemu_free(cpuid); -- 1.6.0.6