target-i386: Cleanup 'foo' feature handling
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 <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
912ffc479c
commit
258f5abe9a
|
@ -1768,18 +1768,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp)
|
||||||
error_setg(errp, "unrecognized feature %s", featurestr);
|
error_setg(errp, "unrecognized feature %s", featurestr);
|
||||||
goto out;
|
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 {
|
} else {
|
||||||
error_setg(errp, "feature string `%s' not in format (+feature|"
|
feat2prop(featurestr);
|
||||||
"-feature|feature=xyz)", featurestr);
|
object_property_parse(OBJECT(cpu), "on", featurestr, errp);
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
if (error_is_set(errp)) {
|
if (error_is_set(errp)) {
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue