From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD5QQ-0004It-Uq for qemu-devel@nongnu.org; Mon, 10 Feb 2014 23:58:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD5QL-000506-AZ for qemu-devel@nongnu.org; Mon, 10 Feb 2014 23:58:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD5QL-0004zU-2q for qemu-devel@nongnu.org; Mon, 10 Feb 2014 23:58:21 -0500 Date: Tue, 11 Feb 2014 07:03:17 +0200 From: "Michael S. Tsirkin" Message-ID: <20140211050317.GA1367@redhat.com> References: <1392077522-11903-1-git-send-email-joel@jms.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1392077522-11903-1-git-send-email-joel@jms.id.au> Subject: Re: [Qemu-devel] [PATCH] virtio-net: remove function calls from assert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Joel Stanley Cc: qemu-devel@nongnu.org, aliguori@amazon.com On Tue, Feb 11, 2014 at 10:42:02AM +1030, Joel Stanley wrote: > peer_{de,at}tach were called from inside assert(). This will be a > problem for virtio-net if built with NDEBUG. > > Signed-off-by: Joel Stanley Thanks, applied. > --- > 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); > } > } > } > -- > 1.9.rc1