conf: Change virDomainCputune member 'shares' to unsigned long long

cgroup functions set and get the longer type so use it everywhere

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fb05bf734c0ee70715a39c2bb82b54ce76007c1f..7108c7e1af37299a809df55bb586eae579b76b90 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15528,8 +15528,8 @@ virDomainDefParseXML(xmlDocPtr xml,
         goto error;
 
     /* Extract cpu tunables. */
-    if ((n = virXPathULong("string(./cputune/shares[1])", ctxt,
-                           &def->cputune.shares)) < -1) {
+    if ((n = virXPathULongLong("string(./cputune/shares[1])", ctxt,
+                               &def->cputune.shares)) < -1) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("can't parse cputune shares value"));
         goto error;
@@ -22158,7 +22158,7 @@ virDomainCputuneDefFormat(virBufferPtr buf,
     virBufferAdjustIndent(&childrenBuf, virBufferGetIndent(buf, false) + 2);
 
     if (def->cputune.sharesSpecified)
-        virBufferAsprintf(&childrenBuf, "<shares>%lu</shares>\n",
+        virBufferAsprintf(&childrenBuf, "<shares>%llu</shares>\n",
                           def->cputune.shares);
     if (def->cputune.period)
         virBufferAsprintf(&childrenBuf, "<period>%llu</period>\n",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 82e581bb0f9533104a13f8c95681889fd9d0b6bb..4e0550c4a164bcea8c2a8460d8a5431f916fadc3 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2011,7 +2011,7 @@ typedef struct _virDomainCputune virDomainCputune;
 typedef virDomainCputune *virDomainCputunePtr;
 
 struct _virDomainCputune {
-    unsigned long shares;
+    unsigned long long shares;
     bool sharesSpecified;
     unsigned long long period;
     long long quota;

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 0bea32e48392e8f9979cebc83e384de08c244464..5f9e50e15a40fa5bdb5be6afe9edfb2b286d6f2a 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -800,7 +800,7 @@ lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties)
 
     if ((value = virConfGetValue(properties, "lxc.cgroup.cpu.shares")) &&
             value->str) {
-        if (virStrToLong_ul(value->str, NULL, 10, &def->cputune.shares) < 0)
+        if (virStrToLong_ull(value->str, NULL, 10, &def->cputune.shares) < 0)
             goto error;
         def->cputune.sharesSpecified = true;
     }

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index f729e5dc0327d71c96e76e39c8d6906cf270b7c0..68a199f354f71e86ccd80ffd827e2671b7060199 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1547,8 +1547,8 @@ virVMXParseConfig(virVMXContext *ctx,
             def->cputune.shares = vcpus * 1000;
         } else if (STRCASEEQ(sched_cpu_shares, "high")) {
             def->cputune.shares = vcpus * 2000;
-        } else if (virStrToLong_ul(sched_cpu_shares, NULL, 10,
-                                   &def->cputune.shares) < 0) {
+        } else if (virStrToLong_ull(sched_cpu_shares, NULL, 10,
+                                    &def->cputune.shares) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting VMX entry 'sched.cpu.shares' to be an "
                              "unsigned integer or 'low', 'normal' or 'high' but "
@@ -3251,7 +3251,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
         } else if (def->cputune.shares == vcpus * 2000) {
             virBufferAddLit(&buffer, "sched.cpu.shares = \"high\"\n");
         } else {
-            virBufferAsprintf(&buffer, "sched.cpu.shares = \"%lu\"\n",
+            virBufferAsprintf(&buffer, "sched.cpu.shares = \"%llu\"\n",
                               def->cputune.shares);
         }
     }