From patchwork Mon Jul 15 22:25:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 259276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30B402C00D7 for ; Tue, 16 Jul 2013 08:28:30 +1000 (EST) Received: from localhost ([::1]:57945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrFr-00055n-Ts for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2013 18:28:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrE8-0002Ij-7g for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UyrE6-0001sU-91 for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrE5-0001rQ-Vr for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:38 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FMQbEV012108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 15 Jul 2013 18:26:37 -0400 Received: from thinkpad.redhat.com (vpn-229-233.phx2.redhat.com [10.3.229.233]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6FMQL4G014418; Mon, 15 Jul 2013 18:26:35 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2013 00:25:59 +0200 Message-Id: <1373927181-24247-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1373927181-24247-1-git-send-email-imammedo@redhat.com> References: <1373927181-24247-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Eduardo Habkost , Vadim Rozenfeld , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 06/20] target-i386: cleanup 'foo' feature handling' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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;