From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHA8K-00042b-Gn for qemu-devel@nongnu.org; Fri, 30 Jan 2015 06:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHA8J-0004kw-Jv for qemu-devel@nongnu.org; Fri, 30 Jan 2015 06:53:08 -0500 From: "Richard W.M. Jones" Date: Fri, 30 Jan 2015 11:52:57 +0000 Message-Id: <1422618777-8832-1-git-send-email-rjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] Fix comparisons between implicit booleans and integers. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-trivial@nongnu.org Cc: lersek@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com In GCC 5 there is a new warning (-Wlogical-not-parentheses) which prevents you from writing: if ( =3D=3D ) ... A typical error would be: kvm-all.c: In function =E2=80=98kvm_set_migration_log=E2=80=99: kvm-all.c:383:54: error: logical not is only applied to the left hand sid= e of comparison [-Werror=3Dlogical-not-parentheses] if (!!(mem->flags & KVM_MEM_LOG_DIRTY_PAGES) =3D=3D enable) { Fix a few places where the build is now broken in GCC 5. The warning isn't even consistent, as with the place in hw/net/virtio-net.c where I had to cast an obviously boolean expression to bool. Signed-off-by: Richard W.M. Jones --- hw/net/virtio-net.c | 2 +- kvm-all.c | 2 +- qemu-img.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 45da34a..ba6afb8 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -121,7 +121,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uin= t8_t status) } =20 if (!!n->vhost_started =3D=3D - (virtio_net_started(n, status) && !nc->peer->link_down)) { + (bool) (virtio_net_started(n, status) && !nc->peer->link_down)) = { return; } if (!n->vhost_started) { diff --git a/kvm-all.c b/kvm-all.c index 2f21a4e..b6d4387 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -366,7 +366,7 @@ static void kvm_log_stop(MemoryListener *listener, } } =20 -static int kvm_set_migration_log(int enable) +static int kvm_set_migration_log(bool enable) { KVMState *s =3D kvm_state; KVMSlot *mem; diff --git a/qemu-img.c b/qemu-img.c index 4e9a7f5..acf70fa 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -977,7 +977,8 @@ static int is_allocated_sectors_min(const uint8_t *bu= f, int n, int *pnum, static int compare_sectors(const uint8_t *buf1, const uint8_t *buf2, int= n, int *pnum) { - int res, i; + bool res; + int i; =20 if (n <=3D 0) { *pnum =3D 0; --=20 2.2.2