From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2F38C2BCA1 for ; Fri, 7 Jun 2019 14:24:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF19320657 for ; Fri, 7 Jun 2019 14:24:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF19320657 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFnB-0006zM-S0 for qemu-devel@archiver.kernel.org; Fri, 07 Jun 2019 10:24:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48924) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFVe-0002nV-IT for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:06:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZFVZ-0003Pw-1W for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:06:18 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35026) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZFVX-0003Mm-1C for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:06:15 -0400 Received: by mail-wm1-f67.google.com with SMTP id c6so2066043wml.0 for ; Fri, 07 Jun 2019 07:06:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=HMP3rEihFjBH9XU24/nsyZD/TaPyKAtcmVNJFg/mXzI=; b=hacRh7cbQHj5K9/JKsFjE1nfYKP0C7nkR0EWjotOb8nYt0qVie+UruVKKjxpNID6xg Y9DQUZpm286X1IDOUD8J9o603lpiXWJ5mSLmabhIor6x94bSP1Rs5pq6K7QNzhiN93hX EI4NYjSrt7GlNsq3OGPEOkBam+B/yfu5irFOYhixvjDMwWp3Wm+4+b+W9rbud/w9CnIo vCIyOkptZTKpr8Q+slvSmmsa7r33QTgAMQFZ0R9ecBMQwFKORAuxgQxL167Ln0syeIga sv9J/o6jJHEWPZl2JUXWcWte4HggUYvLHREXcZa0A1jP1dRy/Nypgkt+STliwnCAFCof AmTw== X-Gm-Message-State: APjAAAVOW6BnIHo+wTtRO/NxD/TYr96NsgsiWKcDhLoS7oNJbl7yQFmk c7G+uagnn1yiia1c4/D6B57yww== X-Google-Smtp-Source: APXvYqx/7f8alZcgAV93+gneU9ablBvq9kv32oNwjghAQ8rVAfpRwOdFHPy8I2OEm7JP2ik4obCe2Q== X-Received: by 2002:a1c:c8:: with SMTP id 191mr3907645wma.6.1559916373787; Fri, 07 Jun 2019 07:06:13 -0700 (PDT) Received: from [192.168.0.156] ([78.192.181.46]) by smtp.gmail.com with ESMTPSA id n19sm1776582wmk.6.2019.06.07.07.06.13 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 07:06:13 -0700 (PDT) To: Yoshinori Sato , qemu-devel@nongnu.org References: <20190607091116.49044-1-ysato@users.sourceforge.jp> <20190607091116.49044-14-ysato@users.sourceforge.jp> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: <8e2dc6b6-23bd-23fb-3fa3-ab7c7d553f69@redhat.com> Date: Fri, 7 Jun 2019 16:06:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190607091116.49044-14-ysato@users.sourceforge.jp> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.67 Subject: Re: [Qemu-devel] [PATCH v17 13/24] target/rx: Fix cpu types and names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/7/19 11:11 AM, Yoshinori Sato wrote: > From: Richard Henderson > > There was confusion here about abstract classes and naming cpus. > We had registered a concrete class named "-rxcpu". This was put > into the default cpu fields, and matched, so basic tests worked. > However, no value for -cpu could ever match in rx_cpu_class_by_name. > > Rename the base class to "rx-cpu" and make it abstract. This > matches what we do for most other targets. Create a new concrete > cpu with the name "rx62n-rx-cpu". > > Signed-off-by: Richard Henderson > Signed-off-by: Yoshinori Sato > --- > target/rx/cpu.h | 12 ++++++------ > hw/rx/rx-virt.c | 2 +- > hw/rx/rx62n.c | 2 +- > target/rx/cpu.c | 43 ++++++++++++++++++++++++++----------------- > 4 files changed, 34 insertions(+), 25 deletions(-) > > diff --git a/target/rx/cpu.h b/target/rx/cpu.h > index 8c1a4e448d..a0b6975963 100644 > --- a/target/rx/cpu.h > +++ b/target/rx/cpu.h > @@ -24,14 +24,14 @@ > #include "hw/registerfields.h" > #include "qom/cpu.h" > > -#define TYPE_RXCPU "rxcpu" > +#define TYPE_RX_CPU "rx-cpu" > > #define RXCPU_CLASS(klass) \ > - OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RXCPU) > + OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RX_CPU) > #define RXCPU(obj) \ > - OBJECT_CHECK(RXCPU, (obj), TYPE_RXCPU) > + OBJECT_CHECK(RXCPU, (obj), TYPE_RX_CPU) > #define RXCPU_GET_CLASS(obj) \ > - OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RXCPU) > + OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RX_CPU) > > /* > * RXCPUClass: > @@ -164,9 +164,9 @@ static inline RXCPU *rx_env_get_cpu(CPURXState *env) > > #define ENV_OFFSET offsetof(RXCPU, env) > > -#define RX_CPU_TYPE_SUFFIX "-" TYPE_RXCPU > +#define RX_CPU_TYPE_SUFFIX "-" TYPE_RX_CPU > #define RX_CPU_TYPE_NAME(model) model RX_CPU_TYPE_SUFFIX > -#define CPU_RESOLVING_TYPE TYPE_RXCPU > +#define CPU_RESOLVING_TYPE TYPE_RX_CPU > > extern const char rx_crname[][6]; > > diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c > index 3deb7cb335..72a2989fcf 100644 > --- a/hw/rx/rx-virt.c > +++ b/hw/rx/rx-virt.c > @@ -88,7 +88,7 @@ static void rxvirt_class_init(ObjectClass *oc, void *data) > mc->desc = "RX QEMU Virtual Target"; > mc->init = rxvirt_init; > mc->is_default = 1; > - mc->default_cpu_type = TYPE_RXCPU; > + mc->default_cpu_type = RX_CPU_TYPE_NAME("rx62n"); > } > > static const TypeInfo rxvirt_type = { > diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c > index c6660b75b4..3a8fe7b0bf 100644 > --- a/hw/rx/rx62n.c > +++ b/hw/rx/rx62n.c > @@ -195,7 +195,7 @@ static void rx62n_realize(DeviceState *dev, Error **errp) > } > > object_initialize_child(OBJECT(s), "cpu", &s->cpu, > - sizeof(RXCPU), TYPE_RXCPU, > + sizeof(RXCPU), RX_CPU_TYPE_NAME("rx62n"), > errp, NULL); > object_property_set_bool(OBJECT(&s->cpu), true, "realized", errp); > > diff --git a/target/rx/cpu.c b/target/rx/cpu.c > index 3268077d08..41fe1de4bb 100644 > --- a/target/rx/cpu.c > +++ b/target/rx/cpu.c > @@ -74,13 +74,14 @@ static void rx_cpu_list_entry(gpointer data, gpointer user_data) > const char *typename = object_class_get_name(OBJECT_CLASS(data)); > int len = strlen(typename) - strlen(RX_CPU_TYPE_SUFFIX); > > - qemu_printf("%.*s\n", len, typename); > + qemu_printf(" %.*s\n", len, typename); > } > > void rx_cpu_list(void) > { > - GSList *list; > - list = object_class_get_list_sorted(TYPE_RXCPU, false); > + GSList *list = object_class_get_list_sorted(TYPE_RX_CPU, false); > + > + qemu_printf("Available CPUs:\n"); > g_slist_foreach(list, rx_cpu_list_entry, NULL); > g_slist_free(list); > } > @@ -88,15 +89,17 @@ void rx_cpu_list(void) > static ObjectClass *rx_cpu_class_by_name(const char *cpu_model) > { > ObjectClass *oc; > - char *typename = NULL; > + char *typename; > > - typename = g_strdup_printf(RX_CPU_TYPE_NAME("")); > + typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > - if (oc != NULL && object_class_is_abstract(oc)) { > - oc = NULL; > - } > - > g_free(typename); > + > + if (oc == NULL || > + object_class_is_abstract(oc) || > + !object_class_dynamic_cast(oc, TYPE_RX_CPU)) { > + return NULL; > + } > return oc; > } > > @@ -166,7 +169,7 @@ static void rx_cpu_init(Object *obj) > qdev_init_gpio_in(DEVICE(cpu), rx_cpu_set_irq, 2); > } > > -static void rxcpu_class_init(ObjectClass *klass, void *data) > +static void rx_cpu_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > CPUClass *cc = CPU_CLASS(klass); > @@ -195,22 +198,28 @@ static void rxcpu_class_init(ObjectClass *klass, void *data) > cc->gdb_num_core_regs = 26; > } > > -static const TypeInfo rxcpu_info = { > - .name = TYPE_RXCPU, > +static const TypeInfo rx_cpu_info = { > + .name = TYPE_RX_CPU, > .parent = TYPE_CPU, > .instance_size = sizeof(RXCPU), > .instance_init = rx_cpu_init, > - .abstract = false, > + .abstract = true, > .class_size = sizeof(RXCPUClass), > - .class_init = rxcpu_class_init, > + .class_init = rx_cpu_class_init, > +}; > + > +static const TypeInfo rx62n_rx_cpu_info = { > + .name = RX_CPU_TYPE_NAME("rx62n"), > + .parent = TYPE_RX_CPU, > }; > > -static void rxcpu_register_types(void) > +static void rx_cpu_register_types(void) > { > - type_register_static(&rxcpu_info); > + type_register_static(&rx_cpu_info); > + type_register_static(&rx62n_rx_cpu_info); > } > > -type_init(rxcpu_register_types) > +type_init(rx_cpu_register_types) > > static uint32_t extable[32]; > > Reviewed-by: Philippe Mathieu-Daudé