From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:37838)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SFAlV-0003xl-Kn
	for qemu-devel@nongnu.org; Tue, 03 Apr 2012 16:55:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SFAlN-0007hq-Oh
	for qemu-devel@nongnu.org; Tue, 03 Apr 2012 16:55:44 -0400
Received: from mail-ob0-f173.google.com ([209.85.214.173]:63043)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SFAlN-0007f4-JT
	for qemu-devel@nongnu.org; Tue, 03 Apr 2012 16:55:37 -0400
Received: by obbup19 with SMTP id up19so183699obb.4
	for <qemu-devel@nongnu.org>; Tue, 03 Apr 2012 13:55:28 -0700 (PDT)
Message-ID: <4F7B63BD.5020107@codemonkey.ws>
Date: Tue, 03 Apr 2012 15:55:25 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1333451753-3550-1-git-send-email-pbonzini@redhat.com>
	<1333451753-3550-6-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1333451753-3550-6-git-send-email-pbonzini@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 05/25] qom: push type up to Object
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, afaerber@suse.de

On 04/03/2012 06:15 AM, Paolo Bonzini wrote:
> Now that Object is a type, add an instance_init function and push
> the "type" property from qdev to there.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>   hw/qdev.c    |    6 ------
>   qom/object.c |   11 +++++++++++
>   2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/hw/qdev.c b/hw/qdev.c
> index 0d3c0fc..bb6c1aa 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -510,11 +510,6 @@ char* qdev_get_fw_dev_path(DeviceState *dev)
>       return strdup(path);
>   }
>
> -static char *qdev_get_type(Object *obj, Error **errp)
> -{
> -    return g_strdup(object_get_typename(obj));
> -}
> -
>   /**
>    * Legacy property handling
>    */
> @@ -630,7 +625,6 @@ static void device_initfn(Object *obj)
>           qdev_property_add_static(dev, prop, NULL);
>       }
>
> -    object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL);
>       qdev_prop_set_defaults(dev, qdev_get_props(dev));
>   }
>
> diff --git a/qom/object.c b/qom/object.c
> index 585619d..f3ffaa6 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -1215,6 +1215,16 @@ void object_property_add_str(Object *obj, const char *name,
>                           prop, errp);
>   }
>
> +static char *qdev_get_type(Object *obj, Error **errp)
> +{
> +    return g_strdup(object_get_typename(obj));
> +}
> +
> +static void object_instance_init(Object *obj)
> +{
> +    object_property_add_str(obj, "type", qdev_get_type, NULL, NULL);
> +}
> +
>   static void register_types(void)
>   {
>       static TypeInfo interface_info = {
> @@ -1226,6 +1236,7 @@ static void register_types(void)
>       static TypeInfo object_info = {
>           .name = TYPE_OBJECT,
>           .instance_size = sizeof(Object),
> +        .instance_init = object_instance_init,
>           .abstract = true,
>       };
>