From patchwork Mon Mar 30 14:28:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Mueller X-Patchwork-Id: 456211 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 456B514008F for ; Tue, 31 Mar 2015 01:35:31 +1100 (AEDT) Received: from localhost ([::1]:34335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycamm-0008AE-8a for incoming@patchwork.ozlabs.org; Mon, 30 Mar 2015 10:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcagQ-00059H-SW for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:29:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcagI-0006lA-Hv for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:28:54 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:40408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcagI-0006kl-9R for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:28:46 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 30 Mar 2015 15:28:45 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 30 Mar 2015 15:28:43 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 814EB1B08072 for ; Mon, 30 Mar 2015 15:29:11 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2UEShfE7995836 for ; Mon, 30 Mar 2015 14:28:43 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2UESgXX015162 for ; Mon, 30 Mar 2015 08:28:43 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2UESdi8014992; Mon, 30 Mar 2015 08:28:42 -0600 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 30 Mar 2015 16:28:19 +0200 Message-Id: <1427725708-52100-7-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033014-0021-0000-0000-000003684D47 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.111 Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , Daniel Hansel , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Richard Henderson , Andreas Faerber , Michael Mueller Subject: [Qemu-devel] [PATCH v4 06/15] target-s390x: Add cpu model alias definition routines 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 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 | 89 +++++++++++++++++++++++++++++++++++++++++++++++ target-s390x/cpu-models.h | 11 ++++++ target-s390x/cpu.c | 1 + 3 files changed, 101 insertions(+) diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c index 028e3de..f792066 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -87,3 +87,92 @@ 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") +static GSList *s390_cpu_aliases; + +static gint s390_cpu_compare_class_name(gconstpointer a, gconstpointer b) +{ + const char *aname = object_class_get_name((ObjectClass *) a); + const char *bname = b; + int blen; + + if (!strcmp(bname, "none") && + !strcmp(aname, TYPE_S390_CPU)) { + return 0; + } + blen = strlen(bname); + if (!strncasecmp(bname, aname, blen) && + !strcmp(aname + blen, "-" TYPE_S390_CPU)) { + return 0; + } + return -1; +} + +/** + * 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_class_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..562464f 100644 --- a/target-s390x/cpu-models.h +++ b/target-s390x/cpu-models.h @@ -35,6 +35,17 @@ #define cpu_class(x) (((x) >> 20) & 0x3) #define cpu_generation(x) (((x) >> 24) & 0xff) +ObjectClass *s390_cpu_class_by_name(const char *name); +int set_s390_cpu_alias(const char *name, const char *model); + +/* + * S390 cpu aliases will be added dynamically + */ +typedef struct S390CPUAlias { + char *name; + char *model; +} S390CPUAlias; + /* * bits 0-7 : CMOS generation * bits 8-9 : reserved diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 0db62c2..2b78e6a 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -310,6 +310,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;