ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paolo Bonzini 2013-12-06 17:54:24 +01:00 committed by Michael S. Tsirkin
parent aef52ee87f
commit 81e3e75b64
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pci/pci.c
View File

@ -212,8 +212,9 @@ void pci_device_reset(PCIDevice *dev)
* Trigger pci bus reset under a given bus. * Trigger pci bus reset under a given bus.
* To be called on RST# assert. * 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; int i;
for (i = 0; i < bus->nirq; i++) { for (i = 0; i < bus->nirq; i++) {
@ -224,11 +225,6 @@ void pci_bus_reset(PCIBus *bus)
pci_device_reset(bus->devices[i]); 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(). /* topology traverse is done by pci_bus_reset().
Tell qbus/qdev walker not to traverse the tree */ Tell qbus/qdev walker not to traverse the tree */

2
hw/pci/pci_bridge.c
View File

@ -268,7 +268,7 @@ void pci_bridge_write_config(PCIDevice *d,
newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
/* Trigger hot reset on 0->1 transition. */ /* Trigger hot reset on 0->1 transition. */
pci_bus_reset(&s->sec_bus); qbus_reset_all(&s->sec_bus.qbus);
} }
} }

1
include/hw/pci/pci.h
View File

@ -373,7 +373,6 @@ void pci_bus_fire_intx_routing_notifier(PCIBus *bus);
void pci_device_set_intx_routing_notifier(PCIDevice *dev, void pci_device_set_intx_routing_notifier(PCIDevice *dev,
PCIINTxRoutingNotifier notifier); PCIINTxRoutingNotifier notifier);
void pci_device_reset(PCIDevice *dev); void pci_device_reset(PCIDevice *dev);
void pci_bus_reset(PCIBus *bus);
PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus, PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,
const char *default_model, const char *default_model,