diff options
| author | Cole Robinson | 2014-03-31 20:31:44 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-03-31 20:53:34 +0200 |
| commit | 58b590148ca1b19f64f533d40e32b5acce5c21e7 (patch) | |
| tree | 238f093e6ee30daf378397edd850617f4ad01872 /hw/pci | |
| parent | Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into sta... (diff) | |
| download | qemu-58b590148ca1b19f64f533d40e32b5acce5c21e7.tar.gz qemu-58b590148ca1b19f64f533d40e32b5acce5c21e7.tar.xz qemu-58b590148ca1b19f64f533d40e32b5acce5c21e7.zip | |
pci: Fix clearing IRQs on reset
irq_state is cleared before calling pci_device_deassert_intx, but the
latter misbehaves if the former isn't accurate. In this case, any raised
IRQs are not cleared, which hits an assertion in pcibus_reset:
qemu-system-x86_64: hw/pci/pci.c:250: pcibus_reset: Assertion
`bus->irq_count[i] == 0' failed.
pci_device_deassert_intx should clear irq_state anyways, so add
an assert.
This fixes migration with usb2 + usb-tablet.
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-id: 7da1ad94ce027183b4049c2de370cb191b0073c1.1396290569.git.crobinso@redhat.com
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci')
| -rw-r--r-- | hw/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 8f722dd961..2a9f08eb0a 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -189,9 +189,9 @@ static void pci_do_device_reset(PCIDevice *dev) { int r; - dev->irq_state = 0; - pci_update_irq_status(dev); pci_device_deassert_intx(dev); + assert(dev->irq_state == 0); + /* Clear all writable bits */ pci_word_test_and_clear_mask(dev->config + PCI_COMMAND, pci_get_word(dev->wmask + PCI_COMMAND) | |