On 10/21/21 12:42 PM, Peter Xu wrote:
> The pci_bus_fn is similar to pci_bus_dev_fn that only takes a PCIBus* and an
> opaque. The pci_bus_ret_fn is similar to pci_bus_fn but it allows to return a
> void* pointer.
>
> Use them where proper in pci.[ch], and to be used elsewhere.
>
> Signed-off-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Eric
> ---
> hw/pci/pci.c | 6 ++----
> include/hw/pci/pci.h | 12 +++++-------
> 2 files changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 6b834cace5..4a84e478ce 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -2072,10 +2072,8 @@ 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)
> +void pci_for_each_bus_depth_first(PCIBus *bus, pci_bus_ret_fn begin,
> + pci_bus_fn end, void *parent_state)
> {
> PCIBus *sec;
> void *state;
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index 437eabe609..a7e81f04d3 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -402,6 +402,8 @@ OBJECT_DECLARE_TYPE(PCIBus, PCIBusClass, PCI_BUS)
> #define TYPE_PCIE_BUS "PCIE"
>
> typedef void (*pci_bus_dev_fn)(PCIBus *b, PCIDevice *d, void *opaque);
> +typedef void (*pci_bus_fn)(PCIBus *b, void *opaque);
> +typedef void* (*pci_bus_ret_fn)(PCIBus *b, void *opaque);
>
> bool pci_bus_is_express(PCIBus *bus);
>
> @@ -470,17 +472,13 @@ void pci_for_each_device_under_bus(PCIBus *bus,
> void pci_for_each_device_under_bus_reverse(PCIBus *bus,
> pci_bus_dev_fn fn,
> 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);
> +void pci_for_each_bus_depth_first(PCIBus *bus, pci_bus_ret_fn begin,
> + pci_bus_fn end, void *parent_state);
> PCIDevice *pci_get_function_0(PCIDevice *pci_dev);
>
> /* 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)
> +void pci_for_each_bus(PCIBus *bus, pci_bus_fn fn, void *opaque)
> {
> pci_for_each_bus_depth_first(bus, NULL, fn, opaque);
> }
