Patchwork [1.5,1/3] pci: do not export pci_bus_reset

login
register
mail settings
Submitter Paolo Bonzini
Date May 2, 2013, 9:38 a.m.
Message ID <1367487519-17332-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/240923/
State New
Headers show

Comments

Paolo Bonzini - May 2, 2013, 9:38 a.m.
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 <cbley@av-test.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/pci/pci.c         | 8 ++------
 hw/pci/pci_bridge.c  | 2 +-
 include/hw/pci/pci.h | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

Patch

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index d5257ed..8e9b983 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -214,8 +214,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++) {
@@ -226,11 +227,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_bridge.c b/hw/pci/pci_bridge.c
index 24be6c5..6be116b 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -264,7 +264,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);
     }
 }
 
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 8d075ab..b994c73 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -377,7 +377,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);