From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gEY-0004RD-MJ for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1gEX-0003tI-Le for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gEX-0003tA-CQ for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:13 -0400 From: Igor Mammedov Date: Wed, 15 Aug 2012 18:13:21 +0200 Message-Id: <1345047221-26898-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1345047221-26898-1-git-send-email-imammedo@redhat.com> References: <1345047221-26898-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 01/21] target-i386: return Error from cpu_x86_find_by_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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, ehabkost@redhat.com it will allow to use property setters there later. Signed-off-by: Igor Mammedov -- v2: style change, add braces (reqested by Blue Swirl) --- target-i386/cpu.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6d5d0d6..49286ca 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -859,7 +859,8 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, cpu->env.tsc_khz = value / 1000; } -static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) +static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, + const char *cpu_model, Error **errp) { unsigned int i; x86_def_t *def; @@ -1004,6 +1005,11 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) fprintf(stderr, "feature string `%s' not in format (+feature|-feature|feature=xyz)\n", featurestr); goto error; } + + if (error_is_set(errp)) { + goto error; + } + featurestr = strtok(NULL, ","); } x86_cpu_def->features |= plus_features; @@ -1027,6 +1033,9 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) error: g_free(s); + if (!error_is_set(errp)) { + error_set(errp, QERR_INVALID_PARAMETER_COMBINATION); + } return -1; } @@ -1155,8 +1164,10 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) memset(def, 0, sizeof(*def)); - if (cpu_x86_find_by_name(def, cpu_model) < 0) - return -1; + if (cpu_x86_find_by_name(cpu, def, cpu_model, &error) < 0) { + goto out; + } + if (def->vendor1) { env->cpuid_vendor1 = def->vendor1; env->cpuid_vendor2 = def->vendor2; @@ -1195,6 +1206,8 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) env->cpuid_svm_features &= TCG_SVM_FEATURES; } object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); + +out: if (error_is_set(&error)) { error_free(error); return -1; -- 1.7.11.2