[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20] target-i386: cleanup 'foo=val' feature handli
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 07/20] target-i386: cleanup 'foo=val' feature handling |
Date: |
Tue, 16 Jul 2013 00:26:00 +0200 |
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 42c54df..edf15ad 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1586,15 +1586,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];
@@ -1610,10 +1602,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;
@@ -1645,8 +1633,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/21 v9] target-i386: convert CPU features into properties, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 02/20] target-i386: convert 'hv_spinlocks' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 01/20] target-i386: Move hyperv_* static globals to X86CPU, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 03/20] target-i386: convert 'hv_relaxed' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 04/20] target-i386: convert 'hv_vapic' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 05/20] target-i386: convert 'check' and 'enforce' to static properties, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 06/20] target-i386: cleanup 'foo' feature handling', Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 07/20] target-i386: cleanup 'foo=val' feature handling,
Igor Mammedov <=
- [Qemu-devel] [PATCH 08/20] target-i386: cpu: convert 'level' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 09/20] target-i386: cpu: convert 'xlevel' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 10/20] target-i386: cpu: convert 'family' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 11/20] target-i386: cpu: convert 'model' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 12/20] target-i386: cpu: convert 'stepping' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 13/20] target-i386: cpu: convert 'vendor' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 14/20] target-i386: cpu: convert 'model-id' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 15/20] target-i386: cpu: convert 'tsc-frequency' to static property, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 15/21] target-i386: cpu: substitute '_' with '-' for +-foo feature bits as well, Igor Mammedov, 2013/07/15
- [Qemu-devel] [PATCH 16/21] target-i386: cpu: convert 'tsc-frequency' to static property, Igor Mammedov, 2013/07/15