From patchwork Mon Oct 22 15:02:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 193233 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 DA82C2C0100 for ; Tue, 23 Oct 2012 03:56:03 +1100 (EST) Received: from localhost ([::1]:42591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJYS-0001y2-OX for incoming@patchwork.ozlabs.org; Mon, 22 Oct 2012 11:04:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJY3-0001TM-EM for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQJXu-0000ZW-0Q for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJXt-0000ZF-O0 for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:01 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF3w41015573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Oct 2012 11:03:58 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF3OnB031350; Mon, 22 Oct 2012 11:03:55 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 22 Oct 2012 17:02:56 +0200 Message-Id: <1350918203-25198-11-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-1-git-send-email-imammedo@redhat.com> References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 10/37] 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. - convert CPUID features "feat" to "f-feat" format used by static properties 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 breaks 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 v4: * convert "+/-feat" to CPUID static features format "f-feat" * fixup xlevel in compat_normalize_cpu_model() instead of its property setter, it's needed for moving xlevel into static properties --- target-i386/cpu.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ target-i386/cpu.h | 2 ++ 2 files changed, 82 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index dbf2be7..4bbfe9b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1250,6 +1250,86 @@ 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() + */ +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] == '+' || featurestr[0] == '-') { + const gchar *feat = featurestr + 1; + gchar *cpuid_fname = g_strconcat("f-", feat, NULL); + + if (qdev_prop_find(DEVICE_CLASS(object_class_by_name(TYPE_X86_CPU)), + cpuid_fname)) { + feat = cpuid_fname; + } + + if (featurestr[0] == '+') { + /* + * preseve legacy behaviour, if feature was disabled once + * do not allow to enable it again + */ + if (!qdict_haskey(*features, feat)) { + qdict_put(*features, feat, qstring_from_str("on")); + } + } else { + qdict_put(*features, feat, qstring_from_str("off")); + } + + g_free(cpuid_fname); + } 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 if (!strcmp(featurestr, "xlevel")) { + uint32_t numvalue; + char *err; + numvalue = strtoul(val, &err, 0); + if (!*val || *err) { + error_setg(errp, "bad xlevel value %s", val); + goto out; + } + if (numvalue < 0x80000000) { + numvalue += 0x80000000; + fprintf(stderr, "warning: xlevel: %s is too small," + "correcting it to: %u\n", val, numvalue); + } + val = g_strdup_printf("%u", numvalue); + qdict_put(*features, featurestr, qstring_from_str(val)); + g_free(val); + } else { + qdict_put(*features, featurestr, qstring_from_str(val)); + } + } else { + qdict_put(*features, featurestr, qstring_from_str("on")); + } + } + } + +out: + 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) { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 871c270..7903413 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -958,6 +958,8 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model); void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); +void compat_normalize_cpu_model(const char *cpu_model, char **cpu_name, + QDict **features, Error **errp); /* helper.c */ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,