From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVbte-0005qc-1G for qemu-devel@nongnu.org; Thu, 13 Jul 2017 07:03:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVbtY-0001ML-Sj for qemu-devel@nongnu.org; Thu, 13 Jul 2017 07:03:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50010) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dVbtY-0001M9-N0 for qemu-devel@nongnu.org; Thu, 13 Jul 2017 07:02:56 -0400 From: Ladi Prosek Date: Thu, 13 Jul 2017 13:02:34 +0200 Message-Id: <20170713110237.6712-6-lprosek@redhat.com> In-Reply-To: <20170713110237.6712-1-lprosek@redhat.com> References: <20170713110237.6712-1-lprosek@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/8] virtio-blk: use virtqueue_error for errors with queue context List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: casasfernando@hotmail.com, mst@redhat.com, jasowang@redhat.com, armbru@redhat.com, groug@kaod.org, arei.gonglei@huawei.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com virtqueue_error includes queue index in the error output and is preferred for errors that pertain to a virtqueue rather than to the device as a whole. Signed-off-by: Ladi Prosek --- hw/block/virtio-blk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index c0bd247..e82d2a3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -490,20 +490,20 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) VirtIODevice *vdev = VIRTIO_DEVICE(s); if (req->elem.out_num < 1 || req->elem.in_num < 1) { - virtio_error(vdev, "virtio-blk missing headers"); + virtqueue_error(req->vq, "virtio-blk missing headers"); return -1; } if (unlikely(iov_to_buf(iov, out_num, 0, &req->out, sizeof(req->out)) != sizeof(req->out))) { - virtio_error(vdev, "virtio-blk request outhdr too short"); + virtqueue_error(req->vq, "virtio-blk request outhdr too short"); return -1; } iov_discard_front(&iov, &out_num, sizeof(req->out)); if (in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) { - virtio_error(vdev, "virtio-blk request inhdr too short"); + virtqueue_error(req->vq, "virtio-blk request inhdr too short"); return -1; } -- 2.9.3