From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6TXH-00050H-Dt for qemu-devel@nongnu.org; Tue, 19 May 2009 13:55:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6TXB-0004w0-RI for qemu-devel@nongnu.org; Tue, 19 May 2009 13:55:30 -0400 Received: from [199.232.76.173] (port=40186 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6TXB-0004vj-LW for qemu-devel@nongnu.org; Tue, 19 May 2009 13:55:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:39002) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6TXA-0007Eb-W5 for qemu-devel@nongnu.org; Tue, 19 May 2009 13:55:25 -0400 From: Mark McLoughlin In-Reply-To: <4A109614.1040608@redhat.com> References: <1242128454-19078-1-git-send-email-markmc@redhat.com> <4A109614.1040608@redhat.com> Content-Type: text/plain Date: Tue, 19 May 2009 18:55:21 +0100 Message-Id: <1242755721.9151.12.camel@blaa> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2] kvm: work around supported cpuid ioctl() brokenness Reply-To: Mark McLoughlin List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: 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 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fe67eed..7cdcf31 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -45,6 +45,9 @@ 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