[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/14] util: Fix MIN_NON_ZERO
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/14] util: Fix MIN_NON_ZERO |
Date: |
Wed, 13 Jul 2016 15:26:26 +0200 |
From: Fam Zheng <address@hidden>
MIN_NON_ZERO(1, 0) is evaluated to 0. Rewrite the macro to fix it.
Reported-by: Miroslav Rezanina <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 */
--
1.8.3.1
- [Qemu-devel] [PULL 00/14] SCSI, chardev, build fixes for 2016-07-13, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 04/14] main-loop: check return value before using pointer, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 03/14] Use "-s" instead of "--quiet" to resolve non-fatal build error on FreeBSD., Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 05/14] json-streamer: fix double-free on exiting during a parse, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 06/14] disas: avoid including everything in headers compiled from C++, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 08/14] util: Fix MIN_NON_ZERO,
Paolo Bonzini <=
- [Qemu-devel] [PULL 01/14] scsi-bus: Add SCSI scanner support, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 02/14] scsi-bus: Use longer sense buffer with scanners, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 09/14] tap: use an exit notifier to call down_script, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 07/14] qemu-sockets: use qapi_free_SocketAddress in cleanup, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 10/14] slirp: use exit notifier for slirp_smb_cleanup, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 11/14] net: do not use atexit for cleanup, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 13/14] hostmem: fix QEMU crash by 'info memdev', Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 12/14] char: do not use atexit cleanup handler, Paolo Bonzini, 2016/07/13
- [Qemu-devel] [PULL 14/14] hostmem: detect host backend memory is being used properly, Paolo Bonzini, 2016/07/13
- Re: [Qemu-devel] [PULL 00/14] SCSI, chardev, build fixes for 2016-07-13, Peter Maydell, 2016/07/14