From patchwork Mon Nov 12 21:38:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 198487 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 30DA72C0092 for ; Tue, 13 Nov 2012 09:16:56 +1100 (EST) Received: from localhost ([::1]:57248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1jA-00077r-0E for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 16:39:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hh-0004JD-4V for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TY1he-0004hU-1i for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16640) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hd-0004fi-Q7 for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:37:57 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qACLbuSv031815 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:37:56 -0500 Received: from blackpad.lan.raisama.net (vpn1-5-14.gru2.redhat.com [10.97.5.14]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qACLbtHQ006914; Mon, 12 Nov 2012 16:37:55 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 4FE7A203423; Mon, 12 Nov 2012 19:39:06 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 12 Nov 2012 19:38:56 -0200 Message-Id: <1352756342-13716-12-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> References: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Don Slutz Subject: [Qemu-devel] [PATCH 11/17] target-i386: return Error from 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 It will allow us to use property setters there later. Signed-off-by: Igor Mammedov [ehabkost: rebased on top of CPU classes work in progress] Signed-off-by: Eduardo Habkost --- v2: - style change, add braces (requested by Blue Swirl) - removed unused error_is_set(errp) in properties set loop v3: - removed unnecessary whitespace change v4 (ehabkost): - rebased on top of CPU classes work in progress - reworded commit message --- target-i386/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3f04054..214a292 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1147,7 +1147,7 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, } static int cpu_x86_find_by_name(X86CPUDefinition *x86_cpu_def, - const char *cpu_model) + const char *cpu_model, Error **errp) { unsigned int i; X86CPUDefinition *def; @@ -1320,6 +1320,9 @@ static int cpu_x86_find_by_name(X86CPUDefinition *x86_cpu_def, error: g_free(s); + if (!error_is_set(errp)) { + error_set(errp, QERR_INVALID_PARAMETER_COMBINATION); + } return -1; } @@ -1502,7 +1505,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) memset(def, 0, sizeof(*def)); - if (cpu_x86_find_by_name(def, cpu_model) < 0) { + if (cpu_x86_find_by_name(def, cpu_model, &error) < 0) { goto error; }