Message ID | 1360600511-25133-8-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Mon, Feb 11, 2013 at 05:35:09PM +0100, Igor Mammedov wrote: > features check, enforce, hv_relaxed and hv_vapic are treated as boolean set to 'on' > when passed from command line, so it's not neccessary to handle each of them > separetly. Collapse them to one catch-all branch which will treat > any feature in format 'foo' as boolean set to 'on'. > > PS: > 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> > --- > v2: > * use feat2prop() to perform name convertion for hv_vapic and hv_relaxed > --- > target-i386/cpu.c | 13 ++----------- > 1 files changed, 2 insertions(+), 11 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index bad0b12..a22d3a6 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1592,18 +1592,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) > error_setg(errp, "unrecognized feature %s\n", 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)\n", featurestr); > - goto out; > + feat2prop(featurestr); > + object_property_parse(OBJECT(cpu), "on", featurestr, errp); > } > if (error_is_set(errp)) { > goto out; > -- > 1.7.1 > >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bad0b12..a22d3a6 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1592,18 +1592,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) error_setg(errp, "unrecognized feature %s\n", 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)\n", featurestr); - goto out; + feat2prop(featurestr); + object_property_parse(OBJECT(cpu), "on", featurestr, errp); } if (error_is_set(errp)) { goto out;
features check, enforce, hv_relaxed and hv_vapic are treated as boolean set to 'on' when passed from command line, so it's not neccessary to handle each of them separetly. Collapse them to one catch-all branch which will treat any feature in format 'foo' as boolean set to 'on'. PS: 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> --- v2: * use feat2prop() to perform name convertion for hv_vapic and hv_relaxed --- target-i386/cpu.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-)