From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
Subject: Re: [Qemu-devel] [PATCH qom-cpu 3/4] target-ppc: Slim conversion
 of model definitions to QOM subclasses
Date: Wed, 19 Dec 2012 03:46:10 +0100
Message-ID: <50D12A72.6030801@suse.de>
References: <1355817223-13076-1-git-send-email-afaerber@suse.de> <1355817223-13076-4-git-send-email-afaerber@suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: qemu-devel@nongnu.org, kvm <kvm@vger.kernel.org>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	qemu-ppc <qemu-ppc@nongnu.org>,
	David Gibson <david@gibson.dropbear.id.au>
To: Alexander Graf <agraf@suse.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from cantor2.suse.de ([195.135.220.15]:39613 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752924Ab2LSCqV (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 18 Dec 2012 21:46:21 -0500
In-Reply-To: <1355817223-13076-4-git-send-email-afaerber@suse.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Am 18.12.2012 08:53, schrieb Andreas F=C3=A4rber:
> +static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointe=
r b)
> +{
> +    ObjectClass *oc =3D (ObjectClass *)a;
> +    const char *name =3D b;
> =20
> -    return NULL;
> +    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) =3D=
=3D 0 &&
> +        strcmp(object_class_get_name(oc) + strlen(name),
> +               "-" TYPE_POWERPC_CPU) =3D=3D 0) {
> +        return 0;
> +    }
> +    return -1;
>  }
> =20
>  #include <ctype.h>
> =20
> -const ppc_def_t *cpu_ppc_find_by_name (const char *name)
> +static ObjectClass *ppc_cpu_class_by_name(const char *name)
[...]
> +    list =3D object_class_get_list(TYPE_POWERPC_CPU, false);
> +    item =3D g_slist_find_custom(list, name, ppc_cpu_compare_class_n=
ame);
> +    if (item !=3D NULL) {
> +        ret =3D OBJECT_CLASS(item->data);
>      }
> +    g_slist_free(list);
> =20
>      return ret;
>  }
[...]
> +static void ppc_cpu_register_model(const ppc_def_t *def)
> +{
> +    TypeInfo type_info =3D {
> +        .name =3D def->name,
> +        .parent =3D TYPE_POWERPC_CPU,
> +        .class_init =3D ppc_cpu_def_class_init,
> +        .class_data =3D (void *)def,
> +    };
> +
> +    type_register(&type_info);
>  }

Err, needs the following fix:

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 908a558..ad0763e 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -10446,13 +10446,14 @@ static void ppc_cpu_def_class_init(ObjectClas=
s
*oc, void *data)
 static void ppc_cpu_register_model(const ppc_def_t *def)
 {
     TypeInfo type_info =3D {
-        .name =3D def->name,
         .parent =3D TYPE_POWERPC_CPU,
         .class_init =3D ppc_cpu_def_class_init,
         .class_data =3D (void *)def,
     };

+    type_info.name =3D g_strdup_printf("%s-" TYPE_POWERPC_CPU, def->na=
me),
     type_register(&type_info);
+    g_free((gpointer)type_info.name);
 }

 /* CPUClass::reset() */

Not sure how I managed to screw this up so badly, seems I tested corner
cases and -cpu host too much...

Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=
=BCrnberg