aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-12-06 17:54:25 +0100
committerMichael S. Tsirkin <mst@redhat.com>2013-12-23 13:12:35 +0200
commit9bdbbfc3a04c28dc43af5afffb32066623cb0022 (patch)
tree33c80768ce062e7426e7dd4ae899c97bfc3b20d2 /hw
parent81e3e75b6461c53724fe7c7918bc54468fcdaf9d (diff)
downloadqemu-9bdbbfc3a04c28dc43af5afffb32066623cb0022.zip
qemu-9bdbbfc3a04c28dc43af5afffb32066623cb0022.tar.gz
qemu-9bdbbfc3a04c28dc43af5afffb32066623cb0022.tar.bz2
pci: clean up resetting of IRQs
pci_device_reset will deassert the INTX pins, and this will make the irq_count array all-zeroes. Check that this is the case, and remove the existing loop which might even unsync irq_count and irq_state. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci/pci.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 83ea0a0..131e599 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -217,15 +217,16 @@ static int pcibus_reset(BusState *qbus)
PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus);
int i;
- for (i = 0; i < bus->nirq; i++) {
- bus->irq_count[i] = 0;
- }
for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) {
if (bus->devices[i]) {
pci_device_reset(bus->devices[i]);
}
}
+ for (i = 0; i < bus->nirq; i++) {
+ assert(bus->irq_count[i] == 0);
+ }
+
/* topology traverse is done by pci_bus_reset().
Tell qbus/qdev walker not to traverse the tree */
return 1;