From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyId-00042a-F7 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:33:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGyIX-00049o-5g for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:33:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyIW-00048x-Tf for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:33:33 -0400 From: Igor Mammedov Date: Wed, 26 Sep 2012 22:32:37 +0200 Message-Id: <1348691578-17231-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-1-git-send-email-imammedo@redhat.com> References: <1348691578-17231-1-git-send-email-imammedo@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com it will allow to use property setters there later. Signed-off-by: Igor Mammedov Reviewed-by: Don Slutz Reviewed-by: Eduardo Habkost -- v2: - style change, add braces (reqested by Blue Swirl) - removed unused error_is_set(errp) in properties set loop --- target-i386/cpu.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c4e6163..e1e2346 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,7 @@ 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; } + featurestr = strtok(NULL, ","); } x86_cpu_def->features |= plus_features; @@ -1264,6 +1266,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 +1355,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 +1408,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.1