From: Eric Blake <eblake@redhat.com>
Date: Wed, 26 Sep 2012 17:16:36 +0000 (-0600)
Subject: build: avoid older gcc warning
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3da355e8c418c6db4023cc35512c7f47a78851ce;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

build: avoid older gcc warning

Jim Fehlig reported a compilation error with older gcc 4.3.4:

libvirt.c: In function 'virDomainGetEmulatorPinInfo':
libvirt.c:9111: error: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op]

It looks like someone programmed via too much copy-and-paste.

* src/libvirt.c (virDomainGetEmulatorPinInfo): Multiplying by 1 is
a no-op, and thus will never overflow.
---

diff --git a/src/libvirt.c b/src/libvirt.c
index 43591c09b..ada9a86cd 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -9108,11 +9108,6 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap,
         virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
         goto error;
     }
-    if (INT_MULTIPLY_OVERFLOW(1, maplen)) {
-        virLibDomainError(VIR_ERR_OVERFLOW, _("input too large: 1 * %d"),
-                          maplen);
-        goto error;
-    }
 
     /* At most one of these two flags should be set.  */
     if ((flags & VIR_DOMAIN_AFFECT_LIVE) &&