From patchwork Tue Sep 22 09:29:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 34048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2ACD0B7B76 for ; Tue, 22 Sep 2009 19:32:39 +1000 (EST) Received: from localhost ([127.0.0.1]:35898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mq1jg-0004KA-Dr for incoming@patchwork.ozlabs.org; Tue, 22 Sep 2009 05:32:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mq1gp-0003h4-In for qemu-devel@nongnu.org; Tue, 22 Sep 2009 05:29:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mq1gk-0003en-Gm for qemu-devel@nongnu.org; Tue, 22 Sep 2009 05:29:38 -0400 Received: from [199.232.76.173] (port=34978 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mq1gk-0003ee-CI for qemu-devel@nongnu.org; Tue, 22 Sep 2009 05:29:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9182) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mq1gj-00088Z-TI for qemu-devel@nongnu.org; Tue, 22 Sep 2009 05:29:34 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8M9TX2A007387 for ; Tue, 22 Sep 2009 05:29:33 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-80.ams2.redhat.com [10.36.4.80]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8M9TT4X010075; Tue, 22 Sep 2009 05:29:30 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 9CF44700E4; Tue, 22 Sep 2009 11:29:28 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 22 Sep 2009 11:29:19 +0200 Message-Id: <1253611767-6483-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1253611767-6483-1-git-send-email-kraxel@redhat.com> References: <1253611767-6483-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 05/13] inplace allocation for pci, split irq init. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch allows carrying the pcibus struct inplace. Separate allocation is possible as well. It also splits pci_register_bus into two parts (irq setup is separate now). Followup patches will use this. Signed-off-by: Gerd Hoffmann --- hw/pci.c | 43 +++++++++++++++++++++++++++++++++---------- hw/pci.h | 5 +++++ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 64d70ed..ad508a5 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -98,24 +98,47 @@ static void pci_bus_reset(void *opaque) } } -PCIBus *pci_register_bus(DeviceState *parent, const char *name, - pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, - void *irq_opaque, int devfn_min, int nirq) +void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, + const char *name, int devfn_min) { - PCIBus *bus; static int nbus = 0; - bus = FROM_QBUS(PCIBus, qbus_create(&pci_bus_info, parent, name)); - bus->set_irq = set_irq; - bus->map_irq = map_irq; - bus->irq_opaque = irq_opaque; + qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name); bus->devfn_min = devfn_min; - bus->nirq = nirq; - bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0])); bus->next = first_bus; first_bus = bus; vmstate_register(nbus++, &vmstate_pcibus, bus); qemu_register_reset(pci_bus_reset, bus); +} + +PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min) +{ + PCIBus *bus; + + bus = qemu_mallocz(sizeof(*bus)); + bus->qbus.qdev_allocated = 1; + pci_bus_new_inplace(bus, parent, name, devfn_min); + return bus; +} + +void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, + void *irq_opaque, int nirq) +{ + bus->set_irq = set_irq; + bus->map_irq = map_irq; + bus->irq_opaque = irq_opaque; + bus->nirq = nirq; + bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0])); +} + +PCIBus *pci_register_bus(DeviceState *parent, const char *name, + pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, + void *irq_opaque, int devfn_min, int nirq) +{ + PCIBus *bus; + + bus = pci_bus_new(parent, name, devfn_min); + pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq); return bus; } diff --git a/hw/pci.h b/hw/pci.h index caba5c8..2b6a0f2 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -248,6 +248,11 @@ int pci_device_load(PCIDevice *s, QEMUFile *f); typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level); typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num); +void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, + const char *name, int devfn_min); +PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min); +void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, + void *irq_opaque, int nirq); PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int devfn_min, int nirq);