From patchwork Mon Oct 1 12:54:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 188289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 589482C00C2 for ; Mon, 1 Oct 2012 22:56:49 +1000 (EST) Received: from localhost ([::1]:54178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIfYF-00063V-KM for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2012 08:56:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIfY3-00062N-AS for qemu-devel@nongnu.org; Mon, 01 Oct 2012 08:56:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIfXu-0001AU-1k for qemu-devel@nongnu.org; Mon, 01 Oct 2012 08:56:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIfXt-0001AQ-P1 for qemu-devel@nongnu.org; Mon, 01 Oct 2012 08:56:25 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q91CtR8A020353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Oct 2012 08:55:27 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q91CtObG031634; Mon, 1 Oct 2012 08:55:25 -0400 From: Igor Mammedov To: blauwirbel@gmail.com Date: Mon, 1 Oct 2012 14:54:41 +0200 Message-Id: <1349096081-5422-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-8-git-send-email-imammedo@redhat.com> References: <1348691578-17231-8-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@cloudswitch.com, mtosatti@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 18/22 v3] target-i386: parse cpu_model string into set of stringified properties 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 cpu_model string does represent features in following format: ([+-]feat)|(feat=foo)|(feat) which makes it impossible directly use property infrastructure to set features on CPU. This patch introduces parser that splits CPU name from cpu_model and converts legacy features string into canonized set of strings that is compatible with property manipulation infrastructure. PS: * later it could be used as a hook to convert legacy command line features to global properties. Then marked as deprecated and removed with -cpu option in the future. Signed-off-by: Igor Mammedov --- v2: * compiler complains that it's unused function but I guess it is easier for review this way, for pull req I'll squash it into next patch * fix spelling error * initialize sptr, due to a CentOS6 compiler warning, that breakes build when -Werror is set. Suggested-by: Don Slutz v3: * Mingw doesn't have strtok_r(), use g_strsplit() instead of it. Suggested-by: Blue Swirl --- target-i386/cpu.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ad1f088..9cf25f6 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1339,6 +1339,57 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) } } +/* convert legacy cpumodel string to string cpu_name and + * a uniform set of custom features that will be applied to CPU + * using object_property_parse() + */ +static void compat_normalize_cpu_model(const char *cpu_model, char **cpu_name, + QDict **features, Error **errp) +{ + int i; + gchar **feat_array = g_strsplit(cpu_model, ",", 0); + *features = qdict_new(); + + g_assert(feat_array[0] != NULL); + *cpu_name = g_strdup(feat_array[0]); + + for (i = 1; feat_array[i]; ++i) { + gchar *featurestr = feat_array[i]; + char *val; + if (featurestr[0] == '+') { + /* + * preseve legacy behaviour, if feature was disabled once + * do not allow to enable it again + */ + if (!qdict_haskey(*features, featurestr + 1)) { + qdict_put(*features, featurestr + 1, qstring_from_str("on")); + } + } else if (featurestr[0] == '-') { + qdict_put(*features, featurestr + 1, qstring_from_str("off")); + } else { + val = strchr(featurestr, '='); + if (val) { + *val = 0; val++; + if (!strcmp(featurestr, "vendor")) { + qdict_put(*features, "vendor-override", + qstring_from_str("on")); + qdict_put(*features, featurestr, qstring_from_str(val)); + } else if (!strcmp(featurestr, "tsc_freq")) { + qdict_put(*features, "tsc-frequency", + qstring_from_str(val)); + } else { + qdict_put(*features, featurestr, qstring_from_str(val)); + } + } else { + qdict_put(*features, featurestr, qstring_from_str("on")); + } + } + } + + g_strfreev(feat_array); + return; +} + static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, const char *cpu_model, Error **errp) {