From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2k9O-00081a-GU for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2k9L-0007Vf-Kq for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:41:50 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:58971 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2k9L-0007UV-EN for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:41:47 -0400 From: Peter Maydell Date: Fri, 26 Jul 2013 16:41:28 +0100 Message-Id: <1374853288-9912-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1374853288-9912-1-git-send-email-peter.maydell@linaro.org> References: <1374853288-9912-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 for-1.6 2/2] hw/virtio/virtio-mmio: Make QueueNumMax read 0 for unavailable queues List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: KONRAD Frederic , Anthony Liguori , "Michael S. Tsirkin" , kvmarm@lists.cs.columbia.edu, patches@linaro.org The virtio-mmio spec says that QueueNumMax must read zero for queues which are unavailable; implement this, rather than always returning VIRTQUEUE_MAX_SIZE. Signed-off-by: Peter Maydell --- hw/virtio/virtio-mmio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 54d6679..9cf79ce 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -151,6 +151,9 @@ static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) } return proxy->host_features; case VIRTIO_MMIO_QUEUENUMMAX: + if (!virtio_queue_get_num(vdev, vdev->queue_sel)) { + return 0; + } return VIRTQUEUE_MAX_SIZE; case VIRTIO_MMIO_QUEUEPFN: return virtio_queue_get_addr(vdev, vdev->queue_sel) -- 1.7.9.5