Skip to content

Commit

Permalink
pci: Fix clearing IRQs on reset
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
crobinso authored and pm215 committed Mar 31, 2014
1 parent 7d4d797 commit 58b5901
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hw/pci/pci.c
Expand Up @@ -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) |
Expand Down

0 comments on commit 58b5901

Please sign in to comment.