From patchwork Fri Jan 25 11:46:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 215645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 371F22C0094 for ; Fri, 25 Jan 2013 23:30:40 +1100 (EST) Received: from localhost ([::1]:60699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyiQY-0002mX-DB for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2013 07:30:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyiQK-0002mG-Cb for qemu-devel@nongnu.org; Fri, 25 Jan 2013 07:30:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TyhkX-00059I-SC for qemu-devel@nongnu.org; Fri, 25 Jan 2013 06:47:36 -0500 Received: from mail-qc0-f179.google.com ([209.85.216.179]:48312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyhkX-000599-IP for qemu-devel@nongnu.org; Fri, 25 Jan 2013 06:47:13 -0500 Received: by mail-qc0-f179.google.com with SMTP id b40so125080qcq.10 for ; Fri, 25 Jan 2013 03:47:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=w2Q5ZA/aWruE14ZRBWpgIAGBWaKko/KCZjB2iGWn9DE=; b=Xp5Mk+mQkHLf4WPerXxzooYvBZttf1DWHEDcz3mfubwTCtkUQ6owIMbx90Nu20JNeb K78hlRHPvDlovWFC2BsE2ZVkjaFTQpJO/ze8WkjU2L8mCCMwspaRRgw7Ixfw6XxBPWVA pQQEBGGHUQlvaNN7Dozk6Z+SZB10SKld55FyDJB/kOlyPEi5cyIZWOXUqdToz51vfn06 vJzo2HJqOpbdQER9pUOeuYUIfy/zT+6fon4lQxPuNCOU0YIZeBP1a69HwGO++tr70uzs b4bBfRWx8thpoMwMZSafZ+Jc6tRrK8lc92G+GDs532wW6bnT6AgYYkalS0baOU8KTb5X 1ENA== X-Received: by 10.229.206.89 with SMTP id ft25mr204096qcb.27.1359114433091; Fri, 25 Jan 2013 03:47:13 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id eg9sm419389qab.7.2013.01.25.03.47.11 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 03:47:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2013 12:46:50 +0100 Message-Id: <1359114420-16149-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359114420-16149-1-git-send-email-pbonzini@redhat.com> References: <1359114420-16149-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.179 Cc: afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 02/12] pci: use qbus_create in pci_bus_new X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove knowledge of QOM innards. The common part of pci_bus_new and pci_bus_new_inplace is moved to a new function pci_bus_init. Signed-off-by: Paolo Bonzini --- hw/pci/pci.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 5fd1bcf..82b0ef8 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -274,13 +274,12 @@ 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); assert(PCI_FUNC(devfn_min) == 0); bus->devfn_min = devfn_min; bus->address_space_mem = address_space_mem; @@ -293,6 +292,17 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, vmstate_register(NULL, -1, &vmstate_pcibus, bus); } +void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, + const char *name, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + uint8_t devfn_min) +{ + qbus_create_inplace(BUS(bus), TYPE_PCI_BUS, parent, name); + pci_bus_init(bus, parent, name, address_space_mem, + address_space_io, devfn_min); +} + PCIBus *pci_bus_new(DeviceState *parent, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, @@ -300,10 +310,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 = PCI_BUS(qbus_create(TYPE_PCI_BUS, parent, name)); + pci_bus_init(bus, parent, name, address_space_mem, + address_space_io, devfn_min); return bus; }