From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWKz-0005d3-0R for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBWKx-0005nP-Rz for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:41:32 -0400 Received: from hub021-nj-3.exch021.serverdata.net ([206.225.164.218]:53504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWKx-0005nJ-N2 for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:41:31 -0400 Message-ID: <504F93EA.8000608@CloudSwitch.Com> Date: Tue, 11 Sep 2012 15:41:30 -0400 From: Don Slutz MIME-Version: 1.0 References: <1347051311-16122-1-git-send-email-imammedo@redhat.com> <1347051311-16122-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1347051311-16122-2-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/22] target-i386: return Error from cpu_x86_find_by_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, don.slutz@gmail.com, avi@redhat.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com On 09/07/12 16:54, Igor Mammedov wrote: > 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 ac12139..a89bdc4 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1086,7 +1086,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; > @@ -1241,6 +1242,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; > @@ -1264,6 +1270,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; > } > > @@ -1350,8 +1359,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; > @@ -1401,6 +1412,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; Reviewed-by: Don Slutz