From patchwork Thu Aug 16 16:59:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 178060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 27BF42C00A1 for ; Fri, 17 Aug 2012 04:11:27 +1000 (EST) Received: from localhost ([::1]:48347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T24XU-0006jx-Vg for incoming@patchwork.ozlabs.org; Thu, 16 Aug 2012 14:11:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T24XJ-0006g2-5V for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T24XI-0001PS-7g for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T24XH-0001PI-WE for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:12 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7GIAW2Z021733 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Aug 2012 14:11:06 -0400 Received: from blackpad.lan.raisama.net (vpn1-6-48.gru2.redhat.com [10.97.6.48]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7GGw9qr016801; Thu, 16 Aug 2012 12:58:10 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 332122011AC; Thu, 16 Aug 2012 13:59:15 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 16 Aug 2012 13:59:10 -0300 Message-Id: <1345136352-10756-12-git-send-email-ehabkost@redhat.com> In-Reply-To: <1345136352-10756-1-git-send-email-ehabkost@redhat.com> References: <1345136352-10756-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [RFC 11/13] check for NULL cpu_model outside cpu_x86_find_by_name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org cpu_x86_find_by_name() will go away when we move to CPU model classes. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2e24e00..9209bb1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1402,11 +1402,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, X86CPUDefinition *x86_cpu_def, { X86CPUModelTableEntry *def; - if (!cpu_model) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu_model", "NULL"); - return -1; - } - for (def = x86_defs; def; def = def->next) { if (!strcmp(cpu_model, def->name)) { break; @@ -1521,6 +1516,11 @@ X86CPU *cpu_x86_create(const char *cpu_model) env = &cpu->env; env->cpu_model_str = cpu_model; + if (!cpu_model) { + error_set(&error, QERR_INVALID_PARAMETER_VALUE, "cpu_model", "NULL"); + goto error; + } + if (cpu_x86_find_by_name(cpu, def, name, &error) < 0) { goto error; }