From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLpw-0008II-1P for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgLpu-0001B3-4J for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:55 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:34805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLpt-0001A6-U8 for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:54 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so3380479eek.4 for ; Wed, 05 Dec 2012 12:44:53 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 5 Dec 2012 21:44:33 +0100 Message-Id: <1354740282-20679-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> References: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 02/11] qdev: use object_new, not g_malloc to create buses 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 After the previous patch, creation of heap-allocated buses can use qbus_init and does not need to hack the "free" callback. Signed-off-by: Paolo Bonzini --- hw/pci.c | 11 +++++------ hw/pci.h | 5 ----- hw/sysbus.c | 6 ++---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 97a0cd7..377a563 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -274,13 +274,13 @@ int pci_find_domain(const PCIBus *bus) return -1; } -void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, +static void pci_bus_init(PCIBus *bus, DeviceState *parent, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, uint8_t devfn_min) { - qbus_create_inplace(&bus->qbus, TYPE_PCI_BUS, parent, name); + qbus_init(&bus->qbus, parent, name); assert(PCI_FUNC(devfn_min) == 0); bus->devfn_min = devfn_min; bus->address_space_mem = address_space_mem; @@ -300,10 +300,9 @@ PCIBus *pci_bus_new(DeviceState *parent, const char *name, { PCIBus *bus; - bus = g_malloc0(sizeof(*bus)); - pci_bus_new_inplace(bus, parent, name, address_space_mem, - address_space_io, devfn_min); - OBJECT(bus)->free = g_free; + bus = object_new(TYPE_PCI_BUS); + pci_bus_init(bus, parent, name, address_space_mem, + address_space_io, devfn_min); return bus; } diff --git a/hw/pci.h b/hw/pci.h index 4da0c2a..ab01574 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -306,11 +306,6 @@ typedef enum { typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, PCIHotplugState state); -void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, - const char *name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min); PCIBus *pci_bus_new(DeviceState *parent, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, diff --git a/hw/sysbus.c b/hw/sysbus.c index ef8ffb6..a13d69e 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -271,10 +271,8 @@ static void main_system_bus_create(void) { /* assign main_system_bus before qbus_create_inplace() * in order to make "if (bus != sysbus_get_default())" work */ - main_system_bus = g_malloc0(system_bus_info.instance_size); - qbus_create_inplace(main_system_bus, TYPE_SYSTEM_BUS, NULL, - "main-system-bus"); - OBJECT(main_system_bus)->free = g_free; + main_system_bus = object_new(TYPE_SYSTEM_BUS); + qbus_init(main_system_bus, NULL, "main-system-bus"); object_property_add_child(container_get(qdev_get_machine(), "/unattached"), "sysbus", OBJECT(main_system_bus), NULL); -- 1.8.0.1