From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52484)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WB5V7-0001Yi-3W
	for qemu-devel@nongnu.org; Wed, 05 Feb 2014 11:39:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WB5Uy-0004Cl-Lz
	for qemu-devel@nongnu.org; Wed, 05 Feb 2014 11:39:01 -0500
Received: from mail-qa0-x22a.google.com ([2607:f8b0:400d:c00::22a]:36692)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WB5Uy-0004Cf-Hk
	for qemu-devel@nongnu.org; Wed, 05 Feb 2014 11:38:52 -0500
Received: by mail-qa0-f42.google.com with SMTP id k4so916540qaq.1
	for <qemu-devel@nongnu.org>; Wed, 05 Feb 2014 08:38:52 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <52F26915.3090104@redhat.com>
Date: Wed, 05 Feb 2014 17:38:45 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1391609340-11023-1-git-send-email-afaerber@suse.de>
In-Reply-To: <1391609340-11023-1-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] qdev: Fix qdev_try_create() for bus-less
	devices
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: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Il 05/02/2014 15:09, Andreas Färber ha scritto:
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 82a9123..14c8765 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -131,21 +131,27 @@ DeviceState *qdev_create(BusState *bus, const char *name)
>  DeviceState *qdev_try_create(BusState *bus, const char *type)
>  {
>      DeviceState *dev;
> +    ObjectClass *oc;
> +    DeviceClass *dc;
>
> -    if (object_class_by_name(type) == NULL) {
> +    oc = object_class_by_name(type);
> +    if (oc == NULL) {
>          return NULL;
>      }
> +    dc = DEVICE_CLASS(oc);
>      dev = DEVICE(object_new(type));
>      if (!dev) {
>          return NULL;
>      }
>
> -    if (!bus) {
> +    if (!bus && dc->bus_type && strcmp(dc->bus_type, "System") == 0) {

Should you check instead if dev is-a TYPE_SYSBUS_DEVICE?

Does this also leave the nand device out of info qtree, or is it still 
dumped?

Paolo

>          bus = sysbus_get_default();
>      }
>
> -    qdev_set_parent_bus(dev, bus);
> -    object_unref(OBJECT(dev));
> +    if (bus != NULL) {
> +        qdev_set_parent_bus(dev, bus);
> +        object_unref(OBJECT(dev));
> +    }
>      return dev;
>  }
>
>