From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlnbZ-0002Qr-Mn for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlnbR-0007Zw-25 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlnbQ-0007ZY-On for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:00 -0500 From: Igor Mammedov Date: Wed, 27 Nov 2013 23:28:41 +0100 Message-Id: <1385591336-2755-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1385591336-2755-1-git-send-email-imammedo@redhat.com> References: <1385591336-2755-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 01/16] target-i386: cleanup 'foo' feature handling' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de 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 Reviewed-by: Eduardo Habkost --- v2: * use feat2prop() to perform name convertion for hv_vapic and hv_relaxed --- 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 7f74021..8cc4330 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.3.1