bacd9b0468
Rebase to qemu-1.7 GA New monitor command blockdev-add for full featured block device hotplug. Performance and functionality improvements for USB 3.0. Many VFIO improvements ACPI tables can be generated by QEMU and can be used by firmware directly. Support creating and writing .vhdx images. qemu-img map: dump detailed image file metadata
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 4f9f83c8b0a26a24ab2963e57a375b0ba99638f1 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
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 <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(-)
|
|
|
|
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
|
|
index 49eca95..504ed9d 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 290abab..41d8755 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);
|
|
}
|
|
}
|
|
|
|
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
|
|
index b783e68..754b82d 100644
|
|
--- a/include/hw/pci/pci.h
|
|
+++ b/include/hw/pci/pci.h
|
|
@@ -373,7 +373,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, PCIBus *rootbus,
|
|
const char *default_model,
|