From: Eric Blake <eblake@redhat.com>
Date: Tue, 28 May 2013 23:30:30 +0000 (-0600)
Subject: build: fix build with older gcc
X-Git-Tag: v1.0.5.2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecc5ad70d7b416a4f98b89781e5b7a5666ca125;p=thirdparty%2Flibvirt.git

build: fix build with older gcc

gcc 4.1.2 (hello, RHEL 5!) fails to build on 32-bit platforms with:

conf/domain_conf.c: In function 'virDomainDefParseXML':
conf/domain_conf.c:10581: warning: integer constant is too large for 'long' type

Problem introduced in commit f8e3221f9.

* src/conf/domain_conf.c (virDomainDefParseXML): Mark large constants.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit f6817c70b430c1cfdbdc7795cf09626c1fa810d8)
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 15cd9b983d..4dc7d25423 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10315,7 +10315,7 @@ virDomainDefParseXML(xmlDocPtr xml,
 
     if (def->cputune.quota > 0 &&
         (def->cputune.quota < 1000 ||
-         def->cputune.quota > 18446744073709551)) {
+         def->cputune.quota > 18446744073709551LL)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Value of cputune quota must be in range "
                          "[1000, 18446744073709551]"));
@@ -10347,7 +10347,7 @@ virDomainDefParseXML(xmlDocPtr xml,
 
     if (def->cputune.emulator_quota > 0 &&
         (def->cputune.emulator_quota < 1000 ||
-         def->cputune.emulator_quota > 18446744073709551)) {
+         def->cputune.emulator_quota > 18446744073709551LL)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Value of cputune emulator_quota must be in range "
                          "[1000, 18446744073709551]"));