[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/16] target-i386: cleanup 'foo=val' feature handli
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 02/16] target-i386: cleanup 'foo=val' feature handling |
Date: |
Wed, 27 Nov 2013 23:28:42 +0100 |
features family, model, stepping, level, hv_spinlocks are treated similarly
when passed from command line, so it's not necessary to handle each of them
individually. Collapse them to one catch-all branch which will treat
any not explicitly handled feature in format 'foo=val'.
PS:
Any unknown feature will be rejected by property setter so there is no
need to check for unknown feature in cpu_x86_parse_featurestr(), therefore
it's replaced by above mentioned catch-all handler.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
- style fixes
---
target-i386/cpu.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 8cc4330..34d3968 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1706,15 +1706,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char
*features, Error **errp)
} else if ((val = strchr(featurestr, '='))) {
*val = 0; val++;
feat2prop(featurestr);
- if (!strcmp(featurestr, "family")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
- } else if (!strcmp(featurestr, "model")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
- } else if (!strcmp(featurestr, "stepping")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
- } else if (!strcmp(featurestr, "level")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
- } else if (!strcmp(featurestr, "xlevel")) {
+ if (!strcmp(featurestr, "xlevel")) {
char *err;
char num[32];
@@ -1730,10 +1722,6 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char
*features, Error **errp)
}
snprintf(num, sizeof(num), "%" PRIu32, numvalue);
object_property_parse(OBJECT(cpu), num, featurestr, errp);
- } else if (!strcmp(featurestr, "vendor")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
- } else if (!strcmp(featurestr, "model-id")) {
- object_property_parse(OBJECT(cpu), val, featurestr, errp);
} else if (!strcmp(featurestr, "tsc-freq")) {
int64_t tsc_freq;
char *err;
@@ -1765,8 +1753,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char
*features, Error **errp)
snprintf(num, sizeof(num), "%" PRId32, numvalue);
object_property_parse(OBJECT(cpu), num, featurestr, errp);
} else {
- error_setg(errp, "unrecognized feature %s", featurestr);
- goto out;
+ object_property_parse(OBJECT(cpu), val, featurestr, errp);
}
} else {
feat2prop(featurestr);
--
1.8.3.1
- [Qemu-devel] [PATCH qom-cpu 00/16 v10] target-i386: convert CPU features into properties, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 01/16] target-i386: cleanup 'foo' feature handling', Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 02/16] target-i386: cleanup 'foo=val' feature handling,
Igor Mammedov <=
- [Qemu-devel] [PATCH 05/16] target-i386: cpu: convert 'family' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 03/16] target-i386: cpu: convert 'level' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 04/16] target-i386: cpu: convert 'xlevel' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 06/16] target-i386: cpu: convert 'model' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 07/16] target-i386: cpu: convert 'stepping' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 08/16] target-i386: cpu: convert 'vendor' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 11/16] target-i386: set [+-]feature using static properties, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 09/16] target-i386: cpu: convert 'model-id' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 10/16] target-i386: cpu: convert 'tsc-frequency' to static property, Igor Mammedov, 2013/11/27
- [Qemu-devel] [PATCH 13/16] target-i386: use static properties in check_features_against_host() to print CPUID feature names, Igor Mammedov, 2013/11/27