From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROTsE-0003gE-SC for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:36:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROTsD-0005uf-Ub for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:36:54 -0500 Received: from mtagate2.uk.ibm.com ([194.196.100.162]:34135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROTsD-0005uT-NX for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:36:53 -0500 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pAACaqnh024377 for ; Thu, 10 Nov 2011 12:36:53 GMT Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAACaqBI405632 for ; Thu, 10 Nov 2011 12:36:52 GMT Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAACaokd018779 for ; Thu, 10 Nov 2011 05:36:51 -0700 From: Stefan Hajnoczi Date: Thu, 10 Nov 2011 12:36:43 +0000 Message-Id: <1320928604-6642-8-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1320928604-6642-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1320928604-6642-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 7/8] x86/cpuid: Fix crash on -cpu "" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster Spotted by Coverity. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- target-i386/cpuid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 99cff65..21e5896 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -594,9 +594,9 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) uint32_t numvalue; for (def = x86_defs; def; def = def->next) - if (!strcmp(name, def->name)) + if (name && !strcmp(name, def->name)) break; - if (kvm_enabled() && strcmp(name, "host") == 0) { + if (kvm_enabled() && name && strcmp(name, "host") == 0) { cpu_x86_fill_host(x86_cpu_def); } else if (!def) { goto error; -- 1.7.7.1