Commit d27ba624 authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

util: Fix MIN_NON_ZERO 



MIN_NON_ZERO(1, 0) is evaluated to 0. Rewrite the macro to fix it.

Reported-by: default avatarMiroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <1468306113-847-1-git-send-email-famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 73f40c18

include/qemu/osdep.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */