From patchwork Fri Jun 19 12:03:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 486673 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 9FA671401E7 for ; Fri, 19 Jun 2015 22:04:25 +1000 (AEST) Received: from localhost ([::1]:57712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5v1z-0008In-RV for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 08:04:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5v1V-0007fe-Ky for qemu-devel@nongnu.org; Fri, 19 Jun 2015 08:03:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5v1R-0004DU-Kz for qemu-devel@nongnu.org; Fri, 19 Jun 2015 08:03:53 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:44428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5v1R-0004DN-BI for qemu-devel@nongnu.org; Fri, 19 Jun 2015 08:03:49 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 19 Jun 2015 13:03:47 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 19 Jun 2015 13:03:46 +0100 X-Helo: d06dlp03.portsmouth.uk.ibm.com X-MailFrom: gkurz@linux.vnet.ibm.com X-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9E6A41B08067 for ; Fri, 19 Jun 2015 13:04:47 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t5JC3jpw23199746 for ; Fri, 19 Jun 2015 12:03:45 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t5JC3jdB002718 for ; Fri, 19 Jun 2015 06:03:45 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t5JC3idG002706; Fri, 19 Jun 2015 06:03:44 -0600 Received: from bahia.huguette.org (sig-9-81-96-216.evts.de.ibm.com [9.81.96.216]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 1DAC9220178; Fri, 19 Jun 2015 14:03:43 +0200 (CEST) From: Greg Kurz To: "Michael S. Tsirkin" Date: Fri, 19 Jun 2015 14:03:43 +0200 Message-ID: <20150619120238.15531.98834.stgit@bahia.huguette.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15061912-0029-0000-0000-00000522A14D X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.113 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v2] vhost_net: fix misuse of assert() 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 >From assert(3): "assert() is implemented as a macro; if the expression tested has side-effects, program behavior will be different depending on whether NDEBUG is defined." Even if QEMU isn't compiled with NDEBUG, it is bad practice to put bits with a relevant functionnal meaning in assert(). This is a readability enhancement. The patch does not fix any bug. Suggested-by: Thomas Huth Signed-off-by: Greg Kurz --- hw/net/vhost_net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) v2: rewrote commit log 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)