From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TinH8-0002ac-BX for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:27:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TinGu-00061k-OL for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:27:06 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:47686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TinGu-00061V-Jw for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:26:52 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so891587iac.4 for ; Wed, 12 Dec 2012 06:26:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 12 Dec 2012 15:26:35 +0100 Message-Id: <1355322396-32026-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1355322396-32026-1-git-send-email-pbonzini@redhat.com> References: <1355322396-32026-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] virtio-pci: reset all qbuses too when writing to the status field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, mst@redhat.com virtio-pci devices do not perform a full reset when zero is written to the status field. 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). The patch calls qdev_reset_all, which calls virtio_pci_reset, instead of basically inlining the contents of the latter. Reported-by: Bryan Venteicher Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/virtio-pci.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 71f4fb5..a1685f1 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_pci_stop_ioeventfd(proxy); - virtio_reset(proxy->vdev); - 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,19 +283,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) } break; case VIRTIO_PCI_STATUS: - 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) { - virtio_reset(proxy->vdev); - 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.1