[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] virtio-pci: reset all qbuses too when writing
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/15] virtio-pci: reset all qbuses too when writing to the status field |
Date: |
Mon, 17 Dec 2012 17:24:48 +0100 |
virtio-pci devices do not perform a full reset when zero is written
to the status byte. While PCI-specific status is initialized, the
reset does not propagate down the qdev bus hierarchy. Because of
this, a virtio reset does not cancel in-flight I/O for virtio-scsi
(where the cancellation is handled automatically by the SCSI
devices underneath virtio-scsi-pci).
Reported-by: Bryan Venteicher <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio-pci.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a7c75fe..2cf5282 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -268,12 +268,10 @@ static void virtio_ioport_write(void *opaque, uint32_t
addr, uint32_t val)
case VIRTIO_PCI_QUEUE_PFN:
pa = (hwaddr)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT;
if (pa == 0) {
- virtio_reset(proxy->vdev);
- virtio_pci_stop_ioeventfd(proxy);
- msix_unuse_all_vectors(&proxy->pci_dev);
- }
- else
+ qdev_reset_all(&proxy->pci_dev.qdev);
+ } else {
virtio_queue_set_addr(vdev, vdev->queue_sel, pa);
+ }
break;
case VIRTIO_PCI_QUEUE_SEL:
if (val < VIRTIO_PCI_QUEUE_MAX)
@@ -285,22 +283,16 @@ static void virtio_ioport_write(void *opaque, uint32_t
addr, uint32_t val)
}
break;
case VIRTIO_PCI_STATUS:
- if (vdev->status == 0) {
- virtio_reset(proxy->vdev);
- }
-
- if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) {
- virtio_pci_stop_ioeventfd(proxy);
- }
-
virtio_set_status(vdev, val & 0xFF);
- if (val & VIRTIO_CONFIG_S_DRIVER_OK) {
- virtio_pci_start_ioeventfd(proxy);
- }
-
if (vdev->status == 0) {
- msix_unuse_all_vectors(&proxy->pci_dev);
+ qdev_reset_all(&proxy->pci_dev.qdev);
+ } else {
+ if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) {
+ virtio_pci_stop_ioeventfd(proxy);
+ } else {
+ virtio_pci_start_ioeventfd(proxy);
+ }
}
/* Linux before 2.6.34 sets the device as OK without enabling
--
1.8.0.2
- [Qemu-devel] [PATCH 06/15] qdev: add qbus_reset_all, (continued)
- [Qemu-devel] [PATCH 06/15] qdev: add qbus_reset_all, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 04/15] virtio-pci: reset device before PCI layer, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 08/15] lsi: use qbus_reset_all to reset SCSI bus, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 07/15] pci: do not export pci_bus_reset, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 09/15] qdev: allow both pre- and post-order vists in qdev walking functions, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 10/15] qdev: switch reset to post-order, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 11/15] qdev: remove device_reset, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 15/15] virtio-serial: do not perform bus reset by hand, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 14/15] virtio-s390: reset all qbuses too when writing to the status field, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 13/15] virtio-pci: reset all qbuses too when writing to the status field,
Paolo Bonzini <=
[Qemu-devel] [PATCH 12/15] qdev: document reset semantics, Paolo Bonzini, 2012/12/17
Re: [Qemu-devel] [PATCH 00/15] qdev: make reset semantics more clear and consistent, reset qbuses under virtio devices, Michael S. Tsirkin, 2012/12/17