From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLji-0005GZ-Lz for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlLjf-0002MI-Fl for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLjf-0002MC-8N for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:07 -0500 From: Stefan Hajnoczi Date: Wed, 19 Dec 2012 16:38:14 +0100 Message-Id: <1355931499-7912-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1355931499-7912-1-git-send-email-stefanha@redhat.com> References: <1355931499-7912-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 13/18] virtio-blk: Return UNSUPP for unknown request types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori From: Alexey Zaytsev Currently, all unknown requests are treated as VIRTIO_BLK_T_IN Signed-off-by: Alexey Zaytsev Signed-off-by: Stefan Hajnoczi --- hw/virtio-blk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 538a0ae..132180c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -398,10 +398,14 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1], req->elem.out_num - 1); virtio_blk_handle_write(req, mrb); - } else { + } else if (type == VIRTIO_BLK_T_IN || type == VIRTIO_BLK_T_BARRIER) { + /* VIRTIO_BLK_T_IN is 0, so we can't just & it. */ qemu_iovec_init_external(&req->qiov, &req->elem.in_sg[0], req->elem.in_num - 1); virtio_blk_handle_read(req); + } else { + virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); + g_free(req); } } -- 1.8.0.2