From patchwork Fri Apr 17 07:59:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 461970 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 EDA0F1402D5 for ; Fri, 17 Apr 2015 18:04:47 +1000 (AEST) Received: from localhost ([::1]:40037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1GX-0006pQ-Lw for incoming@patchwork.ozlabs.org; Fri, 17 Apr 2015 04:04:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1CI-0006Z2-9E for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yj1CF-0001Q7-EW for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1CF-0001Pw-70 for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:00:19 -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 t3H80Frf028312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Apr 2015 04:00:16 -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 t3H7xbeF004102; Fri, 17 Apr 2015 04:00:11 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 17 Apr 2015 15:59:22 +0800 Message-Id: <1429257573-7359-8-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 07/18] virtio: Return error from virtqueue_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 The only caller is virtio-net, which now passes in error_abort. Signed-off-by: Fam Zheng --- hw/net/virtio-net.c | 4 ++-- hw/virtio/virtio.c | 9 +++++++-- include/hw/virtio/virtio.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index bbcb51f..5529b6f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -877,7 +877,7 @@ static int virtio_net_has_buffers(VirtIONetQueue *q, int bufsize) VirtIONet *n = q->n; if (virtio_queue_empty(q->rx_vq) || (n->mergeable_rx_bufs && - !virtqueue_avail_bytes(q->rx_vq, bufsize, 0))) { + !virtqueue_avail_bytes(q->rx_vq, bufsize, 0, &error_abort))) { virtio_queue_set_notification(q->rx_vq, 1); /* To avoid a race condition where the guest has made some buffers @@ -886,7 +886,7 @@ static int virtio_net_has_buffers(VirtIONetQueue *q, int bufsize) */ if (virtio_queue_empty(q->rx_vq) || (n->mergeable_rx_bufs && - !virtqueue_avail_bytes(q->rx_vq, bufsize, 0))) { + !virtqueue_avail_bytes(q->rx_vq, bufsize, 0, &error_abort))) { return 0; } } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e6f9f6b..7c5ca07 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -443,12 +443,17 @@ done: } int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, - unsigned int out_bytes) + unsigned int out_bytes, Error **errp) { + Error *local_err = NULL; unsigned int in_total, out_total; virtqueue_get_avail_bytes(vq, &in_total, &out_total, in_bytes, out_bytes, - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } return in_bytes <= in_total && out_bytes <= out_total; } diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index c478f48..34fb62c 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -144,7 +144,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, Error **errp); int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem, Error **errp); int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, - unsigned int out_bytes); + unsigned int out_bytes, Error **errp); void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, unsigned int *out_bytes, unsigned max_in_bytes, unsigned max_out_bytes,