[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] target-i386: Cleanup 'foo' feature handling
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 09/10] target-i386: Cleanup 'foo' feature handling |
Date: |
Tue, 24 Dec 2013 13:59:00 +0100 |
From: Igor Mammedov <address@hidden>
Features check, enforce, hv_relaxed and hv_vapic are treated as boolean
set to 'on' when passed from command line, so it's not necessary to
handle each of them separately. Collapse them to one catch-all branch
which will treat any feature in format 'foo' as boolean set to 'on'.
Any unknown feature will be rejected by CPU 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>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 6055035..9c020a4 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1768,18 +1768,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char
*features, Error **errp)
error_setg(errp, "unrecognized feature %s", featurestr);
goto out;
}
- } else if (!strcmp(featurestr, "check")) {
- object_property_parse(OBJECT(cpu), "on", featurestr, errp);
- } else if (!strcmp(featurestr, "enforce")) {
- object_property_parse(OBJECT(cpu), "on", featurestr, errp);
- } else if (!strcmp(featurestr, "hv_relaxed")) {
- object_property_parse(OBJECT(cpu), "on", "hv-relaxed", errp);
- } else if (!strcmp(featurestr, "hv_vapic")) {
- object_property_parse(OBJECT(cpu), "on", "hv-vapic", errp);
} else {
- error_setg(errp, "feature string `%s' not in format (+feature|"
- "-feature|feature=xyz)", featurestr);
- goto out;
+ feat2prop(featurestr);
+ object_property_parse(OBJECT(cpu), "on", featurestr, errp);
}
if (error_is_set(errp)) {
goto out;
--
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 <=
- [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, 2013/12/24
- [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