From nobody Mon Feb 9 23:00:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149255410542373.00583026057984; Tue, 18 Apr 2017 15:21:45 -0700 (PDT) Received: from localhost ([::1]:44881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bVH-0003Uq-Ve for importer@patchew.org; Tue, 18 Apr 2017 18:21:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRS-0000i9-I1 for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRP-0002T6-EE for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35338) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRP-0002Sh-4r for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2625231F3FD; Tue, 18 Apr 2017 22:17:42 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E21617DD4; Tue, 18 Apr 2017 22:17:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2625231F3FD Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2625231F3FD From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:20 -0300 Message-Id: <20170418221724.5707-3-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 18 Apr 2017 22:17:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 2/6] pci: Move pci_bus_init() logic to pci_bus_new_inplace() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, David Gibson , Laszlo Ersek , Marcel Apfelbaum , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of having 3 separate functions, just make pci_bus_new() a wrapper that allocates the object and calls pci_bus_new_inplace(). Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- hw/pci/pci.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 328f36cd21..0d28ee4e3f 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -357,24 +357,6 @@ const char *pci_root_bus_path(PCIDevice *dev) return rootbus->qbus.name; } =20 -static void pci_bus_init(PCIBus *bus, DeviceState *parent, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min) -{ - PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); - - assert(PCI_FUNC(devfn_min) =3D=3D 0); - bus->devfn_min =3D devfn_min; - bus->address_space_mem =3D address_space_mem; - bus->address_space_io =3D address_space_io; - - /* host bridge */ - QLIST_INIT(&bus->child); - - QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); -} - bool pci_bus_is_express(PCIBus *bus) { return object_dynamic_cast(OBJECT(bus), TYPE_PCIE_BUS); @@ -391,8 +373,20 @@ void pci_bus_new_inplace(PCIBus *bus, size_t bus_size,= DeviceState *parent, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename) { + PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); + qbus_create_inplace(bus, bus_size, typename, parent, name); - pci_bus_init(bus, parent, address_space_mem, address_space_io, devfn_m= in); + + assert(PCI_FUNC(devfn_min) =3D=3D 0); + bus->devfn_min =3D devfn_min; + bus->address_space_mem =3D address_space_mem; + bus->address_space_io =3D address_space_io; + + /* host bridge */ + QLIST_INIT(&bus->child); + + QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); + } =20 PCIBus *pci_bus_new(DeviceState *parent, const char *name, @@ -400,10 +394,11 @@ PCIBus *pci_bus_new(DeviceState *parent, const char *= name, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename) { - PCIBus *bus; + size_t bus_size =3D object_type_get_instance_size(typename); + PCIBus *bus =3D g_malloc(bus_size); =20 - bus =3D PCI_BUS(qbus_create(typename, parent, name)); - pci_bus_init(bus, parent, address_space_mem, address_space_io, devfn_m= in); + pci_bus_new_inplace(bus, bus_size, parent, name, address_space_mem, + address_space_io, devfn_min, typename); return bus; } =20 --=20 2.11.0.259.g40922b1