External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
cgroup functions set and get the longer type so use it everywhere
This commit is contained in:
Peter Krempa 2016-05-25 12:14:00 +02:00
parent 8bf8838fb4
commit e6e144689d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -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",

2
src/conf/domain_conf.h
View File

@ -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;

2
src/lxc/lxc_native.c
View File

@ -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;
}

6
src/vmx/vmx.c
View File

@ -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);
}
}