From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754578AbbCBMsl (ORCPT ); Mon, 2 Mar 2015 07:48:41 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:48372 "EHLO e06smtp10.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753768AbbCBMoo (ORCPT ); Mon, 2 Mar 2015 07:44:44 -0500 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson , Eduardo Habkost , Michael Mueller Subject: [PATCH v3 08/16] target-s390x: Add cpu model alias definition routines Date: Mon, 2 Mar 2015 13:44:00 +0100 Message-Id: <1425300248-40277-9-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1425300248-40277-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1425300248-40277-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15030212-0041-0000-0000-000003694E50 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 bd9f0bc..608189d 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -87,3 +87,92 @@ S390_PROC_DEF("2827-ga1", CPU_S390_2827_GA1, "IBM zEnterprise EC12 GA1") 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") +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.3 + */ +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.3 + */ +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 d5f0b59..a32f559 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 7a26b91..1992910 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -308,6 +308,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; -- 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSPiJ-0005Jk-Ui for qemu-devel@nongnu.org; Mon, 02 Mar 2015 07:44:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSPiD-00045e-4a for qemu-devel@nongnu.org; Mon, 02 Mar 2015 07:44:47 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:33584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSPiC-00045I-Rw for qemu-devel@nongnu.org; Mon, 02 Mar 2015 07:44:41 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Mar 2015 12:44:39 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6606D2190061 for ; Mon, 2 Mar 2015 12:44:30 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t22CicEt10551658 for ; Mon, 2 Mar 2015 12:44:38 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t22CiZVg003613 for ; Mon, 2 Mar 2015 05:44:37 -0700 From: Michael Mueller Date: Mon, 2 Mar 2015 13:44:00 +0100 Message-Id: <1425300248-40277-9-git-send-email-mimu@linux.vnet.ibm.com> In-Reply-To: <1425300248-40277-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1425300248-40277-1-git-send-email-mimu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 08/16] target-s390x: Add cpu model alias definition routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 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 bd9f0bc..608189d 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -87,3 +87,92 @@ S390_PROC_DEF("2827-ga1", CPU_S390_2827_GA1, "IBM zEnterprise EC12 GA1") 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") +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.3 + */ +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.3 + */ +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 d5f0b59..a32f559 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 7a26b91..1992910 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -308,6 +308,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; -- 1.8.3.1