From fdfb18690d09a5004fd09f25c49b0eada949b1c4 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 26 Sep 2012 11:16:36 -0600 Subject: [PATCH] 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. (cherry picked from commit 3da355e8c418c6db4023cc35512c7f47a78851ce) --- src/libvirt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 0cbcfbf288..dfda67f88a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9102,11 +9102,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) &&