From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1jQ-0001HC-2t for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF1jH-0003Fu-26 for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:16:59 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:59641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1jG-00038a-Oh for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:16:50 -0400 Received: by mail-pz0-f46.google.com with SMTP id z9so4190452dad.33 for ; Tue, 03 Apr 2012 04:16:49 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Apr 2012 13:15:40 +0200 Message-Id: <1333451753-3550-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> References: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/25] qdev: factor setting of global properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.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 07ac525..3d95940 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -448,7 +448,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 d2b0134..adef566 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -129,7 +129,6 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) } qdev_set_parent_bus(dev, bus); - qdev_prop_set_globals(dev); return dev; } @@ -644,6 +643,7 @@ static void device_initfn(Object *obj) qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL); } + qdev_prop_set_globals(dev); } /* Unlink device from bus and free the structure. */ -- 1.7.9.3