[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/20] target-i386: prepare cpu_x86_parse_featurestr
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 12/20] target-i386: prepare cpu_x86_parse_featurestr() to return a set of key, value property pairs |
Date: |
Fri, 28 Dec 2012 21:01:27 +0100 |
It prepares for converting "+feature,-feature,feature=foo,feature" into
a set of key,value property pairs that will be applied to CPU by
cpu_x86_set_props().
It separates legacy format parsing from property setting, later it could be
transformed into code that sets global properties for a given CPU type.
Each feature handled by cpu_x86_parse_featurestr() will be converted into
foo,val pair and a corresponding property setter by following patches.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0a39632..eb0dcc2 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1245,9 +1245,25 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def,
const char *name)
return 0;
}
+/* Set features on X86CPU object based on a provide key,value list */
+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;
+ }
+ }
+}
+
/* Parse "+feature,-feature,feature=foo" CPU feature string
*/
-static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features)
+static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features,
+ QDict **props)
{
char *featurestr; /* Single 'key=value" string being parsed */
/* Features to be added */
@@ -1261,10 +1277,11 @@ static int cpu_x86_parse_featurestr(x86_def_t
*x86_cpu_def, char *features)
uint32_t minus_kvm_features = 0, minus_svm_features = 0;
uint32_t minus_7_0_ebx_features = 0;
uint32_t numvalue;
+ gchar **feat_array = g_strsplit(features ? features : "", ",", 0);
+ *props = qdict_new();
+ int j = 0;
- featurestr = features ? strtok(features, ",") : NULL;
-
- while (featurestr) {
+ while ((featurestr = feat_array[j++])) {
char *val;
if (featurestr[0] == '+') {
add_flagname_to_bitmaps(featurestr + 1, &plus_features,
@@ -1361,7 +1378,6 @@ static int cpu_x86_parse_featurestr(x86_def_t
*x86_cpu_def, char *features)
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;
x86_cpu_def->ext_features |= plus_ext_features;
@@ -1377,9 +1393,11 @@ static int cpu_x86_parse_featurestr(x86_def_t
*x86_cpu_def, char *features)
x86_cpu_def->kvm_features &= ~minus_kvm_features;
x86_cpu_def->svm_features &= ~minus_svm_features;
x86_cpu_def->cpuid_7_0_ebx_features &= ~minus_7_0_ebx_features;
+ g_strfreev(feat_array);
return 0;
error:
+ g_strfreev(feat_array);
return -1;
}
@@ -1487,6 +1505,7 @@ static void filter_features_for_kvm(X86CPU *cpu)
int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
{
x86_def_t def1, *def = &def1;
+ QDict *props = NULL;
Error *error = NULL;
char *name, *features;
gchar **model_pieces;
@@ -1512,14 +1531,16 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
&def->ext3_features, &def->kvm_features,
&def->svm_features, &def->cpuid_7_0_ebx_features);
- if (cpu_x86_parse_featurestr(def, features) < 0) {
+ if (cpu_x86_parse_featurestr(def, features, &props) < 0) {
error_setg(&error, "Invalid cpu_model string format: %s", cpu_model);
goto out;
}
cpudef_2_x86_cpu(cpu, def, &error);
+ cpu_x86_set_props(cpu, props, &error);
out:
+ QDECREF(props);
g_strfreev(model_pieces);
if (error) {
fprintf(stderr, "%s\n", error_get_pretty(error));
--
1.7.1
- [Qemu-devel] [PATCH 00/20 v4] x86 CPU cleanup (wave 2), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 02/20] target-i386: sanitize AMD's ext2_features at realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 01/20] target-i386: filter out unsupported features at realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 04/20] target-i386: setting default 'vendor' is obsolete, remove it, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 03/20] target-i386: explicitly set vendor for each built-in cpudef, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 06/20] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 08/20] target-i386: move kvm_check_features_against_host() check to realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 05/20] target-i386: move setting defaults out of cpu_x86_parse_featurestr(), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 07/20] target-i386: cpu_x86_register() consolidate freeing resources, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 12/20] target-i386: prepare cpu_x86_parse_featurestr() to return a set of key, value property pairs,
Igor Mammedov <=
- [Qemu-devel] [PATCH 09/20] target-i386: add x86cpu_vendor_words2str(), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 13/20] target-i386: set custom 'vendor' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 16/20] target-i386: set custom 'level' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 10/20] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 15/20] target-i386: set custom 'xlevel' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 11/20] target-i386: remove vendor_override field from CPUX86State, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 14/20] target-i386: print deprecated warning if xlevel < 0x80000000, Igor Mammedov, 2012/12/28