From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ1JA-0002o6-2D for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ1J5-0002jc-2O for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:47:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ1J4-0002iR-QP for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:47:22 -0500 Date: Thu, 27 Feb 2014 15:52:44 +0200 From: "Michael S. Tsirkin" Message-ID: <1393426933-27514-4-git-send-email-mst@redhat.com> References: <1393426933-27514-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1393426933-27514-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 3/8] virtio-net: remove function calls from assert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Joel Stanley , Anthony Liguori From: Joel Stanley peer_{de,at}tach were called from inside assert(). We don't support building without NDEBUG but it's not tidy. Rearrange to attach peer outside assert calls. Signed-off-by: Joel Stanley Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3626608..535948d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -401,12 +401,15 @@ static int peer_detach(VirtIONet *n, int index) static void virtio_net_set_queues(VirtIONet *n) { int i; + int r; for (i = 0; i < n->max_queues; i++) { if (i < n->curr_queues) { - assert(!peer_attach(n, i)); + r = peer_attach(n, i); + assert(!r); } else { - assert(!peer_detach(n, i)); + r = peer_detach(n, i); + assert(!r); } } } -- MST