From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT6yF-00007v-Mk for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:19:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VT6y7-0004QN-BM for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:19:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT6y7-0004Q9-25 for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:19:11 -0400 Date: Mon, 7 Oct 2013 12:21:31 +0300 From: "Michael S. Tsirkin" Message-ID: <1381137467-6678-2-git-send-email-mst@redhat.com> References: <1381137467-6678-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1381137467-6678-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/4] pci: add pci_for_each_bus_depth_first List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann , Anthony Liguori , Igor Mammedov , Laszlo Ersek , afaerber@suse.de Add a method to scan pci buses in a predictable order. Useful for ACPI hotplug. Document that order is not guaranteed for pci_for_each_device, and re-implement using that. Signed-off-by: Michael S. Tsirkin --- include/hw/pci/pci.h | 14 ++++++++++++++ hw/pci/pci.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 4b90e5d..6259e23 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -391,6 +391,20 @@ int pci_bus_num(PCIBus *s); void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d, void *opaque), void *opaque); +void pci_for_each_bus_depth_first(PCIBus *bus, + void *(*begin)(PCIBus *bus, void *parent_state), + void (*end)(PCIBus *bus, void *state), + void *parent_state); + +/* Use this wrapper when specific scan order is not required. */ +static inline +void pci_for_each_bus(PCIBus *bus, + void (*fn)(PCIBus *bus, void *opaque), + void *opaque) +{ + pci_for_each_bus_depth_first(bus, NULL, fn, opaque); +} + PCIBus *pci_find_primary_bus(void); PCIBus *pci_device_root_bus(const PCIDevice *d); const char *pci_root_bus_path(PCIDevice *dev); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index c3fdff4..728f7b9 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1682,6 +1682,34 @@ static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num) return NULL; } +void pci_for_each_bus_depth_first(PCIBus *bus, + void *(*begin)(PCIBus *bus, void *parent_state), + void (*end)(PCIBus *bus, void *state), + void *parent_state) +{ + PCIBus *sec; + void *state; + + if (!bus) { + return; + } + + if (begin) { + state = begin(bus, parent_state); + } else { + state = parent_state; + } + + QLIST_FOREACH(sec, &bus->child, sibling) { + pci_for_each_bus_depth_first(sec, begin, end, state); + } + + if (end) { + end(bus, state); + } +} + + PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) { bus = pci_find_bus_nr(bus, bus_num); -- MST