From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvz1w-0003Jp-8F for qemu-devel@nongnu.org; Mon, 09 Nov 2015 21:51:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvz1r-000762-4e for qemu-devel@nongnu.org; Mon, 09 Nov 2015 21:51:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvz1q-000750-Tj for qemu-devel@nongnu.org; Mon, 09 Nov 2015 21:51:27 -0500 References: <1446796969-8049-1-git-send-email-jasowang@redhat.com> <1446796969-8049-7-git-send-email-jasowang@redhat.com> <20151109141446.183a3016.cornelia.huck@de.ibm.com> From: Jason Wang Message-ID: <56415BA9.2060107@redhat.com> Date: Tue, 10 Nov 2015 10:51:21 +0800 MIME-Version: 1.0 In-Reply-To: <20151109141446.183a3016.cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V3 6/6] virtio-pci: unbreak queue_enable read List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: qemu-devel@nongnu.org, mst@redhat.com On 11/09/2015 09:14 PM, Cornelia Huck wrote: > On Fri, 6 Nov 2015 16:02:49 +0800 > Jason Wang wrote: > >> Guest always get zero when reading queue_enable. This violates >> spec. Fixing this by setting the queue_enable to true during any guest >> writing and setting it to zero during reset. >> >> Cc: Michael S. Tsirkin >> Signed-off-by: Jason Wang >> --- >> hw/virtio/virtio-pci.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c >> index e4449da..52a9e33 100644 >> --- a/hw/virtio/virtio-pci.c >> +++ b/hw/virtio/virtio-pci.c >> @@ -1384,6 +1384,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, >> proxy->vqs[vdev->queue_sel].avail[0], >> ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 | >> proxy->vqs[vdev->queue_sel].used[0]); >> + proxy->vqs[vdev->queue_sel].enabled = 1; > Hm. Spec says that the driver MUST NOT write 0 here. Yes. > Does this need a > check? Add warn in this case? I'm not sure, I read the spec as "writing any value implies enabling". (And the patch itself does not conflict the spec). > > handled now.> Yes > >> break; >> case VIRTIO_PCI_COMMON_Q_DESCLO: >> proxy->vqs[vdev->queue_sel].desc[0] = val; >> @@ -1831,9 +1832,15 @@ static void virtio_pci_reset(DeviceState *qdev) >> { >> VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); >> VirtioBusState *bus = VIRTIO_BUS(&proxy->bus); >> + int i; >> + >> virtio_pci_stop_ioeventfd(proxy); >> virtio_bus_reset(bus); >> msix_unuse_all_vectors(&proxy->pci_dev); >> + >> + for (i = 0; i < VIRTIO_QUEUE_MAX; i++) { >> + proxy->vqs[i].enabled = 0; >> + } >> } >> >> static Property virtio_pci_properties[] = { > Otherwise, this looks good to me. > > Thanks