From patchwork Mon Apr 13 13:56:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Mueller X-Patchwork-Id: 6209571 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C9419F1C4 for ; Mon, 13 Apr 2015 14:02:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8619C2034B for ; Mon, 13 Apr 2015 14:02:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF1C12034C for ; Mon, 13 Apr 2015 14:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932281AbbDMOAy (ORCPT ); Mon, 13 Apr 2015 10:00:54 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:33019 "EHLO e06smtp16.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754234AbbDMN5J (ORCPT ); Mon, 13 Apr 2015 09:57:09 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 Apr 2015 14:57:07 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 13 Apr 2015 14:57:05 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 0C919219006A; Mon, 13 Apr 2015 14:56:50 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3DDv4jG56295476; Mon, 13 Apr 2015 13:57:04 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3DDv3qd031971; Mon, 13 Apr 2015 07:57:04 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t3DDuwIP031505; Mon, 13 Apr 2015 07:57:03 -0600 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Michael Mueller , Andreas Faerber , Richard Henderson , Daniel Hansel Subject: [PATCH v5 10/17] target-s390x: Add S390 CPU model alias definition routines Date: Mon, 13 Apr 2015 15:56:29 +0200 Message-Id: <1428933396-37887-11-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428933396-37887-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1428933396-37887-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041313-0025-0000-0000-000004B135F4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements the infrastructure to dynamically add CPU model aliases. Signed-off-by: Michael Mueller Reviewed-by: Cornelia Huck --- target-s390x/cpu-models.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ target-s390x/cpu-models.h | 13 ++++++++ target-s390x/cpu.c | 1 + 3 files changed, 96 insertions(+) diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c index 6cc121b..28251f9 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -88,3 +88,85 @@ S390_PROC_DEF("2827-ga2", CPU_S390_2827_GA2, "IBM zEnterprise EC12 GA2") S390_PROC_DEF("2828-ga1", CPU_S390_2828_GA1, "IBM zEnterprise BC12 GA1") S390_PROC_DEF("2964-ga1", CPU_S390_2964_GA1, "IBM z13 GA1") +GSList *s390_cpu_aliases; + +static gint s390_cpu_compare_name(gconstpointer a, gconstpointer b) +{ + char *aname = strdup_cpu_name((S390CPUClass *) a); + gint rc; + + rc = strcasecmp(aname, (char *) b); + free(aname); + + return rc; +} + +/** + * s390_cpu_class_by_name: + * @name: a cpu model or alias name + * + * The function searches for the requested cpu model name or an alias + * cpu model name and returns the associated object class. + * + * Returns: reference to object class on success or %NULL elsewise. + * + * Since: 2.4 + */ +ObjectClass *s390_cpu_class_by_name(const char *name) +{ + GSList *list, *item; + ObjectClass *ret = NULL; + S390CPUAlias *alias; + + for (item = s390_cpu_aliases; item != NULL; item = item->next) { + alias = (S390CPUAlias *) item->data; + if (strcmp(alias->name, name) == 0) { + return s390_cpu_class_by_name(alias->model); + } + } + list = object_class_get_list(TYPE_S390_CPU, false); + item = g_slist_find_custom(list, name, s390_cpu_compare_name); + if (item) { + ret = OBJECT_CLASS(item->data); + } + g_slist_free(list); + return ret; +} + +/** + * set_s390_cpu_alias: + * @name: the cpu alias name + * @model: the cpu model name + * + * The function registers the alias @name for an existing cpu @model. + * + * Returns: %0 in case of success + * -%EINVAL if name or model is %NULL or both are idential + * or model is not a valid cpu model + * -%ENOMEM if internal memory allocation fails + * + * Since: 2.4 + */ +int set_s390_cpu_alias(const char *name, const char *model) +{ + S390CPUAlias *alias; + + if (!name || !model) { + return -EINVAL; + } + if (!strcmp(name, model)) { + return -EINVAL; + } + if (!s390_cpu_class_by_name(model)) { + return -EINVAL; + } + alias = g_try_malloc0(sizeof(S390CPUAlias)); + if (!alias) { + return -ENOMEM; + } + alias->name = g_strdup(name); + alias->model = g_strdup(model); + s390_cpu_aliases = g_slist_append(s390_cpu_aliases, alias); + return 0; +} + diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h index 948af10..35dde5a 100644 --- a/target-s390x/cpu-models.h +++ b/target-s390x/cpu-models.h @@ -36,6 +36,19 @@ #define cpu_generation(x) (((x) >> 24) & 0xff) /* + * S390 cpu aliases will be added dynamically + */ +typedef struct S390CPUAlias { + char *name; + char *model; +} S390CPUAlias; + +extern GSList *s390_cpu_aliases; + +ObjectClass *s390_cpu_class_by_name(const char *name); +int set_s390_cpu_alias(const char *name, const char *model); + +/* * bits 0-7 : CMOS generation * bits 8-9 : reserved * bits 10-11 : machine class 0=unknown 1=EC 2=BC diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 9232a97..c081885 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -314,6 +314,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) #endif scc->cpu_reset = s390_cpu_reset; scc->initial_cpu_reset = s390_cpu_initial_reset; + cc->class_by_name = s390_cpu_class_by_name; cc->reset = s390_cpu_full_reset; cc->has_work = s390_cpu_has_work; cc->do_interrupt = s390_cpu_do_interrupt;