From patchwork Wed Aug 15 16:13:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 177722 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 A9D542C008D for ; Thu, 16 Aug 2012 02:24:15 +1000 (EST) Received: from localhost ([::1]:42984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gOD-0005CA-My for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 12:24:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFi-0007Nb-Ln for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1gFg-0004MG-Nd for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFg-0004M9-DX for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:24 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7FGFKWf011814 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Aug 2012 12:15:20 -0400 Received: from thinkpad.com (vpn-238-39.phx2.redhat.com [10.3.238.39]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7FGDtI8029187; Wed, 15 Aug 2012 12:15:09 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 18:13:38 +0200 Message-Id: <1345047221-26898-19-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 18/21] target-i386: use properties to set/unset user specified features on CPU 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 Signed-off-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- v2: * fix error of initializing from incorrect cpu model definition use x86_cpu_def instead of def. spotted-by: Eduardo Habkost * add missing env in cpu_x86_find_by_name() * added cpu_x86_set_props() to make following code movement more clean. suggested-by: Eduardo Habkost --- target-i386/cpu.c | 184 ++++++++++-------------------------------------------- 1 file changed, 34 insertions(+), 150 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 98b6bbd..73dbf32 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -207,22 +207,6 @@ static bool lookup_feature(uint32_t *pval, const char *s, const char *e, return found; } -static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features, - uint32_t *ext_features, - uint32_t *ext2_features, - uint32_t *ext3_features, - uint32_t *kvm_features, - uint32_t *svm_features) -{ - if (!lookup_feature(features, flagname, NULL, feature_name) && - !lookup_feature(ext_features, flagname, NULL, ext_feature_name) && - !lookup_feature(ext2_features, flagname, NULL, ext2_feature_name) && - !lookup_feature(ext3_features, flagname, NULL, ext3_feature_name) && - !lookup_feature(kvm_features, flagname, NULL, kvm_feature_name) && - !lookup_feature(svm_features, flagname, NULL, svm_feature_name)) - fprintf(stderr, "CPU feature %s not found\n", flagname); -} - typedef struct x86_def_t { struct x86_def_t *next; const char *name; @@ -1103,7 +1087,6 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_ext_features = def->ext_features; env->cpuid_ext2_features = def->ext2_features; env->cpuid_ext3_features = def->ext3_features; - env->cpuid_kvm_features = def->kvm_features; env->cpuid_svm_features = def->svm_features; env->cpuid_ext4_features = def->ext4_features; env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; @@ -1162,22 +1145,34 @@ static void compat_normalize_cpu_model(const char *cpu_model, char **cpu_name, return; } +/* Set features on X86CPU object based on a QDict */ +static void cpu_x86_set_props(X86CPU *cpu, QDict *features, Error **errp) +{ + const QDictEntry *ent; + + for (ent = qdict_first(features); ent; ent = qdict_next(features, ent)) { + const QString *qval = qobject_to_qstring(qdict_entry_value(ent)); + object_property_parse(OBJECT(cpu), qstring_get_str(qval), + qdict_entry_key(ent), errp); + if (error_is_set(errp)) { + return; + } + } +} + static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, const char *cpu_model, Error **errp) { x86_def_t *def; - char *s = g_strdup(cpu_model); - char *featurestr, *name = strtok(s, ","); - /* Features to be added*/ - uint32_t plus_features = 0, plus_ext_features = 0; - uint32_t plus_ext2_features = 0, plus_ext3_features = 0; - uint32_t plus_kvm_features = 0, plus_svm_features = 0; - /* Features to be removed */ - uint32_t minus_features = 0, minus_ext_features = 0; - uint32_t minus_ext2_features = 0, minus_ext3_features = 0; - uint32_t minus_kvm_features = 0, minus_svm_features = 0; - uint32_t numvalue; + CPUX86State *env = &cpu->env; + QDict *features; + char *name; + + compat_normalize_cpu_model(cpu_model, &name, &features, errp); + if (error_is_set(errp)) { + goto error; + } for (def = x86_defs; def; def = def->next) if (name && !strcmp(name, def->name)) @@ -1190,133 +1185,24 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, memcpy(x86_cpu_def, def, sizeof(*def)); } - plus_kvm_features = ~0; /* not supported bits will be filtered out later */ + cpudef_2_x86_cpu(cpu, x86_cpu_def, errp); - add_flagname_to_bitmaps("hypervisor", &plus_features, - &plus_ext_features, &plus_ext2_features, &plus_ext3_features, - &plus_kvm_features, &plus_svm_features); + /* not supported bits will be filtered out later */ + env->cpuid_kvm_features = ~0; - featurestr = strtok(NULL, ","); + object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp); - while (featurestr) { - char *val; - if (featurestr[0] == '+') { - add_flagname_to_bitmaps(featurestr + 1, &plus_features, - &plus_ext_features, &plus_ext2_features, - &plus_ext3_features, &plus_kvm_features, - &plus_svm_features); - } else if (featurestr[0] == '-') { - add_flagname_to_bitmaps(featurestr + 1, &minus_features, - &minus_ext_features, &minus_ext2_features, - &minus_ext3_features, &minus_kvm_features, - &minus_svm_features); - } else if ((val = strchr(featurestr, '='))) { - *val = 0; val++; - if (!strcmp(featurestr, "family")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err || numvalue > 0xff + 0xf) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->family = numvalue; - } else if (!strcmp(featurestr, "model")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err || numvalue > 0xff) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->model = numvalue; - } else if (!strcmp(featurestr, "stepping")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err || numvalue > 0xf) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->stepping = numvalue ; - } else if (!strcmp(featurestr, "level")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->level = numvalue; - } else if (!strcmp(featurestr, "xlevel")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->xlevel = numvalue; - } else if (!strcmp(featurestr, "vendor")) { - pstrcpy(x86_cpu_def->vendor, sizeof(x86_cpu_def->vendor), val); - x86_cpu_def->vendor_override = 1; - } else if (!strcmp(featurestr, "model_id")) { - pstrcpy(x86_cpu_def->model_id, sizeof(x86_cpu_def->model_id), - val); - } else if (!strcmp(featurestr, "tsc_freq")) { - int64_t tsc_freq; - char *err; - - tsc_freq = strtosz_suffix_unit(val, &err, - STRTOSZ_DEFSUFFIX_B, 1000); - if (tsc_freq < 0 || *err) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->tsc_khz = tsc_freq / 1000; - } else if (!strcmp(featurestr, "hv_spinlocks")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - hyperv_set_spinlock_retries(numvalue); - } else { - fprintf(stderr, "unrecognized feature %s\n", featurestr); - goto error; - } - } else if (!strcmp(featurestr, "check")) { - check_cpuid = 1; - } else if (!strcmp(featurestr, "enforce")) { - check_cpuid = enforce_cpuid = 1; - } else if (!strcmp(featurestr, "hv_relaxed")) { - hyperv_enable_relaxed_timing(true); - } else if (!strcmp(featurestr, "hv_vapic")) { - hyperv_enable_vapic_recommended(true); - } else { - fprintf(stderr, "feature string `%s' not in format (+feature|-feature|feature=xyz)\n", featurestr); - goto error; - } - - if (error_is_set(errp)) { - goto error; - } + cpu_x86_set_props(cpu, features, errp); + QDECREF(features); + if (error_is_set(errp)) { + goto error; + } - featurestr = strtok(NULL, ","); - } - x86_cpu_def->features |= plus_features; - x86_cpu_def->ext_features |= plus_ext_features; - x86_cpu_def->ext2_features |= plus_ext2_features; - x86_cpu_def->ext3_features |= plus_ext3_features; - x86_cpu_def->kvm_features |= plus_kvm_features; - x86_cpu_def->svm_features |= plus_svm_features; - x86_cpu_def->features &= ~minus_features; - x86_cpu_def->ext_features &= ~minus_ext_features; - x86_cpu_def->ext2_features &= ~minus_ext2_features; - x86_cpu_def->ext3_features &= ~minus_ext3_features; - x86_cpu_def->kvm_features &= ~minus_kvm_features; - x86_cpu_def->svm_features &= ~minus_svm_features; - g_free(s); + g_free(name); return 0; error: - g_free(s); + g_free(name); if (!error_is_set(errp)) { error_set(errp, QERR_INVALID_PARAMETER_COMBINATION); } @@ -1448,8 +1334,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) goto out; } - cpudef_2_x86_cpu(cpu, def, &error); - out: if (error_is_set(&error)) { fprintf(stderr, "%s\n", error_get_pretty(error));