From patchwork Fri Apr 17 07:59:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 461967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CF9FC1402DB for ; Fri, 17 Apr 2015 18:03:22 +1000 (AEST) Received: from localhost ([::1]:40023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1FA-0004DF-GL for incoming@patchwork.ozlabs.org; Fri, 17 Apr 2015 04:03:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1C8-0006H8-Tn for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yj1C5-0001Mi-Kk for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1C5-0001MS-EH for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:09 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3H805s6028260 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Apr 2015 04:00:06 -0400 Received: from ad.nay.redhat.com (dhcp-14-137.nay.redhat.com [10.66.14.137]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3H7xbeD004102; Fri, 17 Apr 2015 04:00:01 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 17 Apr 2015 15:59:20 +0800 Message-Id: <1429257573-7359-6-git-send-email-famz@redhat.com> In-Reply-To: <1429257573-7359-1-git-send-email-famz@redhat.com> References: <1429257573-7359-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , "Michael S. Tsirkin" , "Aneesh Kumar K.V" , Stefan Hajnoczi , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH 05/18] virtio: Return error from virtqueue_get_avail_bytes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add errp and pass in error_abort for now. Later, we can add error handling code in callers. Signed-off-by: Fam Zheng --- hw/char/virtio-serial-bus.c | 2 +- hw/virtio/virtio-rng.c | 2 +- hw/virtio/virtio.c | 39 +++++++++++++++++++++++++++------------ include/hw/virtio/virtio.h | 3 ++- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 1e07858..a56dafc 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -272,7 +272,7 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port) if (use_multiport(port->vser) && !port->guest_connected) { return 0; } - virtqueue_get_avail_bytes(vq, &bytes, NULL, 4096, 0); + virtqueue_get_avail_bytes(vq, &bytes, NULL, 4096, 0, &error_abort); return bytes; } diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 06e7178..9e1bd75 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -33,7 +33,7 @@ static size_t get_request_size(VirtQueue *vq, unsigned quota) { unsigned int in, out; - virtqueue_get_avail_bytes(vq, &in, &out, quota, 0); + virtqueue_get_avail_bytes(vq, &in, &out, quota, 0, &error_abort); return in; } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 2a24829..1cd454b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -355,7 +355,8 @@ static int virtqueue_next_desc(VirtIODevice *vdev, hwaddr desc_pa, void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, unsigned int *out_bytes, - unsigned max_in_bytes, unsigned max_out_bytes) + unsigned max_in_bytes, unsigned max_out_bytes, + Error **errp) { unsigned int idx; unsigned int total_bufs, in_total, out_total; @@ -363,27 +364,38 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, idx = vq->last_avail_idx; total_bufs = in_total = out_total = 0; - while (virtqueue_num_heads(vq, idx, &error_abort)) { + while (true) { VirtIODevice *vdev = vq->vdev; unsigned int max, num_bufs, indirect = 0; hwaddr desc_pa; int i; + i = virtqueue_num_heads(vq, idx, errp); + if (i < 0) { + return; + } else if (i == 0) { + break; + } + max = vq->vring.num; num_bufs = total_bufs; - i = virtqueue_get_head(vq, idx++, &error_abort); + i = virtqueue_get_head(vq, idx++, errp); + if (i < 0) { + return; + } + desc_pa = vq->vring.desc; if (vring_desc_flags(vdev, desc_pa, i) & VRING_DESC_F_INDIRECT) { if (vring_desc_len(vdev, desc_pa, i) % sizeof(VRingDesc)) { - error_report("Invalid size for indirect buffer table"); - exit(1); + error_setg(errp, "Invalid size for indirect buffer table"); + return; } /* If we've got too many, that implies a descriptor loop. */ if (num_bufs >= max) { - error_report("Looped descriptor"); - exit(1); + error_setg(errp, "Looped descriptor"); + return; } /* loop over the indirect descriptor table */ @@ -396,8 +408,8 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, while (true) { /* If we've got too many, that implies a descriptor loop. */ if (++num_bufs > max) { - error_report("Looped descriptor"); - exit(1); + error_setg(errp, "Looped descriptor"); + return; } if (vring_desc_flags(vdev, desc_pa, i) & VRING_DESC_F_WRITE) { @@ -408,8 +420,10 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, if (in_total >= max_in_bytes && out_total >= max_out_bytes) { goto done; } - i = virtqueue_next_desc(vdev, desc_pa, i, max, &error_abort); - if (i == max) { + i = virtqueue_next_desc(vdev, desc_pa, i, max, errp); + if (i < 0) { + return; + } else if (i == max) { break; } } @@ -433,7 +447,8 @@ int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, { unsigned int in_total, out_total; - virtqueue_get_avail_bytes(vq, &in_total, &out_total, in_bytes, out_bytes); + virtqueue_get_avail_bytes(vq, &in_total, &out_total, in_bytes, out_bytes, + &error_abort); return in_bytes <= in_total && out_bytes <= out_total; } diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 64c10cf..a37ee64 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -147,7 +147,8 @@ int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, unsigned int out_bytes); void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, unsigned int *out_bytes, - unsigned max_in_bytes, unsigned max_out_bytes); + unsigned max_in_bytes, unsigned max_out_bytes, + Error **errp); void virtio_notify(VirtIODevice *vdev, VirtQueue *vq);