From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tj2c6-0002lq-1c for qemu-devel@nongnu.org; Thu, 13 Dec 2012 01:49:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tj2c4-00017k-V3 for qemu-devel@nongnu.org; Thu, 13 Dec 2012 01:49:45 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:33795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tj2c4-00016R-OQ for qemu-devel@nongnu.org; Thu, 13 Dec 2012 01:49:44 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so568853eaa.4 for ; Wed, 12 Dec 2012 22:49:43 -0800 (PST) From: Alexey Zaytsev Date: Thu, 13 Dec 2012 08:49:26 +0200 Message-Id: <1355381366-25979-1-git-send-email-alexey.zaytsev@gmail.com> Subject: [Qemu-devel] [PATCH] 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: Kevin Wolf , Alexey Zaytsev , Stefan Hajnoczi Currently, all unknown requests are treated as VIRTIO_BLK_T_IN Signed-off-by: Alexey Zaytsev --- 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 e25cc96..1f59a76 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -392,10 +392,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); + f_free(req); } } -- 1.7.10.4