diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
| commit | 365369847f2827b14b96c52d0fbaf9cce404e68a (patch) | |
| tree | 1ee8e1be27e3223b310bbb3d91bf2e54435280b0 /hw/virtio-pci.c | |
| parent | 0cbfcd2b03bd602b7c65f73267bf84d4f7e9fe8d (diff) | |
| parent | 98304c846d8866dae6322ef400ce6595b23cfc41 (diff) | |
| download | focaccia-qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.gz focaccia-qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.zip | |
Merge commit 'mst/for_anthony' into mst
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index aebcf9d0d1..d222ce03fe 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -185,8 +185,10 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) break; case VIRTIO_PCI_QUEUE_PFN: pa = (target_phys_addr_t)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT; - if (pa == 0) - virtio_pci_reset(&proxy->pci_dev.qdev); + if (pa == 0) { + virtio_reset(proxy->vdev); + msix_unuse_all_vectors(&proxy->pci_dev); + } else virtio_queue_set_addr(vdev, vdev->queue_sel, pa); break; @@ -199,8 +201,10 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) break; case VIRTIO_PCI_STATUS: vdev->status = val & 0xFF; - if (vdev->status == 0) - virtio_pci_reset(&proxy->pci_dev.qdev); + if (vdev->status == 0) { + virtio_reset(proxy->vdev); + msix_unuse_all_vectors(&proxy->pci_dev); + } break; case VIRTIO_MSI_CONFIG_VECTOR: msix_vector_unuse(&proxy->pci_dev, vdev->config_vector); |