diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-06 17:54:24 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-12-23 13:12:35 +0200 |
| commit | 81e3e75b6461c53724fe7c7918bc54468fcdaf9d (patch) | |
| tree | 68da44e586b2971ab605f3848d64ca106ef19a04 /hw/pci | |
| parent | aef52ee87f324fb03e0dcd88a84bdd50c8339a5f (diff) | |
| download | qemu-81e3e75b6461c53724fe7c7918bc54468fcdaf9d.zip qemu-81e3e75b6461c53724fe7c7918bc54468fcdaf9d.tar.gz qemu-81e3e75b6461c53724fe7c7918bc54468fcdaf9d.tar.bz2 | |
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/pci')
| -rw-r--r-- | hw/pci/pci.c | 8 | ||||
| -rw-r--r-- | hw/pci/pci_bridge.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 82c11ec..83ea0a0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -212,8 +212,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++) { @@ -224,11 +225,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 f72872e..098c50a 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -268,7 +268,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); } } |