mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-pci: call pci reset variant when guest requests reset.

Browse Source 
Actually fixes linux not finding virtio 1.0 device virtqueues after
reboot.  Which is new I think, any chance linux kernel virtio code
became more strict in 4.3?

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Tested-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Gerd Hoffmann 2016-01-28 16:08:07 +01:00 committed by Michael S. Tsirkin
parent 79248c22ad
commit 75fd6f13af
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/virtio/virtio-pci.c
View File

@ -47,6 +47,7 @@
static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size, static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size,
VirtIOPCIProxy *dev); VirtIOPCIProxy *dev);
static void virtio_pci_reset(DeviceState *qdev);
/* virtio device */ /* virtio device */
/* DeviceState to VirtIOPCIProxy. For use off data-path. TODO: use QOM. */ /* DeviceState to VirtIOPCIProxy. For use off data-path. TODO: use QOM. */
@ -404,9 +405,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
case VIRTIO_PCI_QUEUE_PFN: case VIRTIO_PCI_QUEUE_PFN:
pa = (hwaddr)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT; pa = (hwaddr)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT;
if (pa == 0) { if (pa == 0) {
virtio_pci_stop_ioeventfd(proxy); virtio_pci_reset(DEVICE(proxy));
virtio_reset(vdev);
msix_unuse_all_vectors(&proxy->pci_dev);
} }
else else
virtio_queue_set_addr(vdev, vdev->queue_sel, pa); virtio_queue_set_addr(vdev, vdev->queue_sel, pa);
@ -432,8 +431,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
} }
if (vdev->status == 0) { if (vdev->status == 0) {
virtio_reset(vdev); virtio_pci_reset(DEVICE(proxy));
msix_unuse_all_vectors(&proxy->pci_dev);
} }
/* Linux before 2.6.34 drives the device without enabling /* Linux before 2.6.34 drives the device without enabling
@ -1353,8 +1351,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
} }
if (vdev->status == 0) { if (vdev->status == 0) {
virtio_reset(vdev); virtio_pci_reset(DEVICE(proxy));
msix_unuse_all_vectors(&proxy->pci_dev);
} }
break; break;