From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXnD-0004Wv-9b for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPXn6-0000Mo-45 for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:22 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:35197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXn5-0000MM-Tp for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:16 -0400 Received: by ghrr14 with SMTP id r14so677963ghr.4 for ; Wed, 02 May 2012 04:32:14 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 2 May 2012 13:31:05 +0200 Message-Id: <1335958273-769-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1335958273-769-1-git-send-email-pbonzini@redhat.com> References: <1335958273-769-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 13/21] qdev: clean up global properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, liwp@linux.vnet.ibm.com, afaerber@suse.de Now that global properties do not depend on buses anymore, set them directly in the device instance_init function. Signed-off-by: Paolo Bonzini --- hw/qdev-monitor.c | 1 - hw/qdev.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index d9c6adc..6f2d83e 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -440,7 +440,6 @@ DeviceState *qdev_device_add(QemuOpts *opts) /* create device, set properties */ qdev = DEVICE(object_new(driver)); qdev_set_parent_bus(qdev, bus); - qdev_prop_set_globals(qdev); id = qemu_opts_id(opts); if (id) { diff --git a/hw/qdev.c b/hw/qdev.c index 98efc8b..7288b8e 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -111,7 +111,6 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) } qdev_set_parent_bus(dev, bus); - qdev_prop_set_globals(dev); return dev; } @@ -615,6 +614,7 @@ static void device_initfn(Object *obj) qdev_prop_set_defaults(dev, DEVICE_CLASS(class)->props); class = object_class_get_parent(class); } while (class != object_class_by_name(TYPE_DEVICE)); + qdev_prop_set_globals(dev); } /* Unlink device from bus and free the structure. */ -- 1.7.9.3