From 5ff013a13ea2530c94ffdfb829f922ba450ddef0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 2 May 2013 11:38:37 +0200 Subject: [PATCH] pci: do not export pci_bus_reset qbus_reset_all can be used instead. There is no semantic change because pcibus_reset returns 1 and takes care of the device tree traversal. This will be necessary once the traversal is done always in qbus_reset_all *before* invoking pcibus_reset itself. Tested-by: Claudio Bley Signed-off-by: Paolo Bonzini Signed-off-by: Cole Robinson --- hw/pci/pci.c | 8 ++------ hw/pci/pci.h | 1 - hw/pci/pci_bridge.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2f45c8f..5813ef0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -209,8 +209,9 @@ void pci_device_reset(PCIDevice *dev) * Trigger pci bus reset under a given bus. * To be called on RST# assert. */ -void pci_bus_reset(PCIBus *bus) +static int pcibus_reset(BusState *qbus) { + PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus); int i; for (i = 0; i < bus->nirq; i++) { @@ -221,11 +222,6 @@ void pci_bus_reset(PCIBus *bus) pci_device_reset(bus->devices[i]); } } -} - -static int pcibus_reset(BusState *qbus) -{ - pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus)); /* topology traverse is done by pci_bus_reset(). Tell qbus/qdev walker not to traverse the tree */ diff --git a/hw/pci/pci.h b/hw/pci/pci.h index f340fe5..b9f2a5a 100644 --- a/hw/pci/pci.h +++ b/hw/pci/pci.h @@ -346,7 +346,6 @@ void pci_bus_fire_intx_routing_notifier(PCIBus *bus); void pci_device_set_intx_routing_notifier(PCIDevice *dev, PCIINTxRoutingNotifier notifier); void pci_device_reset(PCIDevice *dev); -void pci_bus_reset(PCIBus *bus); PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 995842a..1b9722e 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -234,7 +234,7 @@ void pci_bridge_write_config(PCIDevice *d, newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ - pci_bus_reset(&s->sec_bus); + qbus_reset_all(&s->sec_bus.qbus); } }