Message ID | 1392077522-11903-1-git-send-email-joel@jms.id.au |
---|---|
State | New |
Headers | show |
On Tue, Feb 11, 2014 at 3:40 PM, Michael S. Tsirkin <mst@redhat.com> wrote: > Just to clarify, I applied this because code looks nicer this way. > We don't support build with NDEBUG - a whole bunch of > stuff will break if you do. > I tweaked the commit log to make this clear. Ok. Thanks for clarifying that. Joel
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); } } }
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 <joel@jms.id.au> --- hw/net/virtio-net.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)