[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] target-i386: Cleanup 'foo=val' feature handlin
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 10/10] target-i386: Cleanup 'foo=val' feature handling |
Date: |
Tue, 24 Dec 2013 13:59:01 +0100 |
From: Igor Mammedov <address@hidden>
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'.
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>
Signed-off-by: Andreas Färber <address@hidden>
---
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 9c020a4..967529a 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.4
- [Qemu-devel] [PULL 00/10] QOM CPUState patch queue 2013-12-24, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 02/10] cputlb: Tidy memset() of arrays, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 01/10] cputlb: Use memset() when flushing entries, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 04/10] cpu-exec: Optimize X86CPU usage in cpu_exec(), Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 03/10] target-i386: Move apic_state field from CPUX86State to X86CPU, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 07/10] target-i386: Convert 'hv_spinlocks' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 09/10] target-i386: Cleanup 'foo' feature handling, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 06/10] target-i386: Convert 'hv_vapic' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 10/10] target-i386: Cleanup 'foo=val' feature handling,
Andreas Färber <=
- [Qemu-devel] [PULL 05/10] target-i386: Convert 'hv_relaxed' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 08/10] target-i386: Convert 'check' and 'enforce' to static properties, Andreas Färber, 2013/12/24