Message ID | 1373927181-24247-7-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On 07/15/2013 04:25 PM, 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 s/neccessary/necessary/ > separetly. Collapse them to one catch-all branch which will treat s/separetly/separately/ > 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> > ---
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 16.12.2013 17:51, schrieb Eric Blake: > On 07/15/2013 04:25 PM, 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 > > s/neccessary/necessary/ > >> separetly. Collapse them to one catch-all branch which will >> treat > > s/separetly/separately/ This one I had already fixed, thanks for pointing out the other one. Andreas > >> 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> --- > - -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJSsx+VAAoJEPou0S0+fgE/RRwP/jy32I+CSASdk1WXiFWgWD0d 00V5JNxp2YRPGfHIOJJKSlrJnBa67DpwCq0XlbqJTf54J78DhpMQGNWUde8rlKJw JR7d0SjmEt13zhOJJVZgmuNHznw5bo0VibfWRxnZ/7xmU+ZBXhgOGnsmtCr3sAfH 351wAx+5dkRWg1zo/wuM7gkQfkL8vMVzThlNaZJeNt3xHqoH97uGBhbC2Nl9u2kP MKkqv26Fzons4GquG3eJvSXQOat2x7+uo1WTkNETWlJC+AWOzVGA0K2FSXLjQexY 2JmE4wV+6MYxAMJCqfs7QtvJOcRRFmO+Qz/DwOH62zVZL+gVfOUErzBD5ka16Bou 6kVrXuqf21lOiLLxed8WtTPjxVKcRUgBUyu9SgD7QP31DDI8f3/mGtH1r1nUaM3v WXW2yzd8yKCaxxjONeUmVT5srtgRRRUWRFmyiByoBH4l7SoYP85ycbqXHuO/jBnY Wd7Mciw1gcW29PofaUgJTFDJheLWw4xLo/z6ZysxFQrbaBFeo+u7pESigxrgYQ+c BKDofJEYPAjKLrm/r365yRgnBU6iQ6Il5qKt9Dtk6f1XeuC42txV0HrDJu+Y/8f7 XH40uVfsadRye+WodZU9/E8MUn4bo34/JMm4CoT8CbVoWltoU2gCAAqrfF9LOflR s+DEEdic7Tca4ZLPGAyg =4UKD -----END PGP SIGNATURE-----
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 56333db..42c54df 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1648,18 +1648,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;