From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMrUv-000658-49 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 02:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMrUp-0003to-1m for qemu-devel@nongnu.org; Tue, 12 Jul 2016 02:48:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMrUo-0003t3-ST for qemu-devel@nongnu.org; Tue, 12 Jul 2016 02:48:42 -0400 From: Fam Zheng Date: Tue, 12 Jul 2016 14:48:33 +0800 Message-Id: <1468306113-847-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] util: Fix MIN_NON_ZERO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven , famz@redhat.com, Miroslav Rezanina , Max Reitz , Stefan Hajnoczi MIN_NON_ZERO(0, 1) is evaluated to 0. Rewrite the macro to fix it. Reported-by: Miroslav Rezanina Signed-off-by: Fam Zheng --- include/qemu/osdep.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index e63da28..e4c6ae6 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -151,7 +151,8 @@ extern int daemon(int, int); /* Minimum function that returns zero only iff both values are zero. * Intended for use with unsigned values only. */ #ifndef MIN_NON_ZERO -#define MIN_NON_ZERO(a, b) (((a) != 0 && (a) < (b)) ? (a) : (b)) +#define MIN_NON_ZERO(a, b) ((a) == 0 ? (b) : \ + ((b) == 0 ? (a) : (MIN(a, b)))) #endif /* Round number down to multiple */ -- 2.7.4