From patchwork Wed Aug 15 16:13:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 177746 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 9C3F52C0087 for ; Thu, 16 Aug 2012 03:12:53 +1000 (EST) Received: from localhost ([::1]:58986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1h9H-0005FN-LA for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 13:12:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFZ-0007CD-1A for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1gFX-0004Kw-Ot for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFX-0004Kk-Ge for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:15 -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 q7FGF83W030777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Aug 2012 12:15:08 -0400 Received: from thinkpad.com (vpn-238-39.phx2.redhat.com [10.3.238.39]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7FGDtI7029187; Wed, 15 Aug 2012 12:15:04 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 18:13:37 +0200 Message-Id: <1345047221-26898-18-git-send-email-imammedo@redhat.com> In-Reply-To: <1345047221-26898-1-git-send-email-imammedo@redhat.com> References: <1345047221-26898-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: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 17/21] 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. * compiler complains that it's unused function but I guess it is easier for review this way Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index d24ef84..98b6bbd 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1110,6 +1110,58 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_xlevel2 = def->xlevel2; } +/* convert legacy cpumodel string to string cpu_name and + * a uniforms 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) +{ + + char *s = g_strdup(cpu_model); + char *featurestr, *sptr; + + *cpu_name = strtok_r(s, ",", &sptr); + *features = qdict_new(); + + featurestr = strtok_r(NULL, ",", &sptr); + while (featurestr) { + 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")); + } + } + + featurestr = strtok_r(NULL, ",", &sptr); + } + + return; +} + static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, const char *cpu_model, Error **errp) {