From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48209)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Z5tCZ-0001i2-Hp
	for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:07:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Z5tCT-0001zG-PK
	for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:07:11 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58558)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Z5tCT-0001zC-Jr
	for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:07:05 -0400
Date: Fri, 19 Jun 2015 12:07:03 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20150619120638-mutt-send-email-mst@redhat.com>
References: <20150619095853.12531.15450.stgit@bahia.huguette.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150619095853.12531.15450.stgit@bahia.huguette.org>
Subject: Re: [Qemu-devel] [PATCH] vhost_net: fix misuse of assert()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Greg Kurz <gkurz@linux.vnet.ibm.com>
Cc: qemu-devel@nongnu.org

On Fri, Jun 19, 2015 at 12:00:53PM +0200, Greg Kurz wrote:
> In case NDEBUG is defined, assert() expands to nothing and
> vhost_net_set_vnet_endian() doesn't get called...
> 
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>

Not sure what the point is.
We don't support building with NDEBUG.

> ---
>  hw/net/vhost_net.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Michael,
> 
> Yet another fix for the cross-endian vhost series... please
> apply.
> 
> --
> Greg
> 
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index f505c91d420a..6d3b7879f8ef 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -376,7 +376,8 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
>      }
>      assert(r >= 0);
>  
> -    assert(vhost_net_set_vnet_endian(dev, ncs[0].peer, false) >= 0);
> +    r = vhost_net_set_vnet_endian(dev, ncs[0].peer, false);
> +    assert(r >= 0);
>  }
>  
>  void vhost_net_cleanup(struct vhost_net *net)