On 6/7/19 11:11 AM, Yoshinori Sato wrote:
> New CPUs should not be suffixed like other devices.
>
> Signed-off-by: Yoshinori Sato <ys...@users.sourceforge.jp>
> ---
> include/hw/rx/rx62n.h | 2 +-
> target/rx/cpu.h | 3 +--
> target/rx/cpu.c | 8 ++------
> 3 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/include/hw/rx/rx62n.h b/include/hw/rx/rx62n.h
> index 5f6912fe46..e57c5ec091 100644
> --- a/include/hw/rx/rx62n.h
> +++ b/include/hw/rx/rx62n.h
> @@ -30,7 +30,7 @@
> #include "target/rx/cpu.h"
> #include "qemu/units.h"
>
> -#define TYPE_RX62N "rx62n"
> +#define TYPE_RX62N "rx62n-mcu"
> #define TYPE_RX62N_CPU RX_CPU_TYPE_NAME(TYPE_RX62N)
> #define RX62N(obj) OBJECT_CHECK(RX62NState, (obj), TYPE_RX62N)
>
> diff --git a/target/rx/cpu.h b/target/rx/cpu.h
> index a0b6975963..080ea604a3 100644
> --- a/target/rx/cpu.h
> +++ b/target/rx/cpu.h
> @@ -164,8 +164,7 @@ static inline RXCPU *rx_env_get_cpu(CPURXState *env)
>
> #define ENV_OFFSET offsetof(RXCPU, env)
>
> -#define RX_CPU_TYPE_SUFFIX "-" TYPE_RX_CPU
> -#define RX_CPU_TYPE_NAME(model) model RX_CPU_TYPE_SUFFIX
> +#define RX_CPU_TYPE_NAME(model) model
> #define CPU_RESOLVING_TYPE TYPE_RX_CPU
>
> extern const char rx_crname[][6];
> diff --git a/target/rx/cpu.c b/target/rx/cpu.c
> index 41fe1de4bb..d8c662b231 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -72,9 +72,8 @@ static void rx_cpu_reset(CPUState *s)
> 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", typename);
> }
>
> void rx_cpu_list(void)
> @@ -89,11 +88,8 @@ void rx_cpu_list(void)
> static ObjectClass *rx_cpu_class_by_name(const char *cpu_model)
> {
> ObjectClass *oc;
> - char *typename;
>
> - typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> + oc = object_class_by_name(cpu_model);
>
> if (oc == NULL ||
> object_class_is_abstract(oc) ||
>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
