NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use virDomainObjGetDefs in lxcDomainGetBlkioParameters

Browse Source
This commit is contained in:
Ján Tomko 2016-05-30 13:19:36 +02:00
parent f62e4f2091
commit e74bbe5caf
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/lxc/lxc_driver.c
View File

@ -2777,13 +2777,12 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData;
size_t i, j; size_t i, j;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr def = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
unsigned int val; unsigned int val;
int ret = -1; int ret = -1;
virCapsPtr caps = NULL;
virLXCDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -2803,9 +2802,6 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
if (virDomainGetBlkioParametersEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetBlkioParametersEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(caps = virLXCDriverGetCapabilities(driver, false)))
goto cleanup;
if ((*nparams) == 0) { if ((*nparams) == 0) {
/* Current number of blkio parameters supported by cgroups */ /* Current number of blkio parameters supported by cgroups */
*nparams = LXC_NB_BLKIO_PARAM; *nparams = LXC_NB_BLKIO_PARAM;
@ -2813,11 +2809,10 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
&persistentDef) < 0)
goto cleanup; goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)) { if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("blkio cgroup isn't mounted")); _("blkio cgroup isn't mounted"));
@ -2838,20 +2833,20 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
case 1: /* blkiotune.device_weight */ case 1: /* blkiotune.device_weight */
if (vm->def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool comma = false; bool comma = false;
for (j = 0; j < vm->def->blkio.ndevices; j++) { for (j = 0; j < def->blkio.ndevices; j++) {
if (!vm->def->blkio.devices[j].weight) if (!def->blkio.devices[j].weight)
continue; continue;
if (comma) if (comma)
virBufferAddChar(&buf, ','); virBufferAddChar(&buf, ',');
else else
comma = true; comma = true;
virBufferAsprintf(&buf, "%s,%u", virBufferAsprintf(&buf, "%s,%u",
vm->def->blkio.devices[j].path, def->blkio.devices[j].path,
vm->def->blkio.devices[j].weight); def->blkio.devices[j].weight);
} }
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;
@ -2865,20 +2860,20 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
case 2: /* blkiotune.device_read_iops */ case 2: /* blkiotune.device_read_iops */
if (vm->def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool comma = false; bool comma = false;
for (j = 0; j < vm->def->blkio.ndevices; j++) { for (j = 0; j < def->blkio.ndevices; j++) {
if (!vm->def->blkio.devices[j].riops) if (!def->blkio.devices[j].riops)
continue; continue;
if (comma) if (comma)
virBufferAddChar(&buf, ','); virBufferAddChar(&buf, ',');
else else
comma = true; comma = true;
virBufferAsprintf(&buf, "%s,%u", virBufferAsprintf(&buf, "%s,%u",
vm->def->blkio.devices[j].path, def->blkio.devices[j].path,
vm->def->blkio.devices[j].riops); def->blkio.devices[j].riops);
} }
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;
@ -2892,20 +2887,20 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
case 3: /* blkiotune.device_write_iops */ case 3: /* blkiotune.device_write_iops */
if (vm->def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool comma = false; bool comma = false;
for (j = 0; j < vm->def->blkio.ndevices; j++) { for (j = 0; j < def->blkio.ndevices; j++) {
if (!vm->def->blkio.devices[j].wiops) if (!def->blkio.devices[j].wiops)
continue; continue;
if (comma) if (comma)
virBufferAddChar(&buf, ','); virBufferAddChar(&buf, ',');
else else
comma = true; comma = true;
virBufferAsprintf(&buf, "%s,%u", virBufferAsprintf(&buf, "%s,%u",
vm->def->blkio.devices[j].path, def->blkio.devices[j].path,
vm->def->blkio.devices[j].wiops); def->blkio.devices[j].wiops);
} }
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;
@ -2919,20 +2914,20 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
case 4: /* blkiotune.device_read_bps */ case 4: /* blkiotune.device_read_bps */
if (vm->def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool comma = false; bool comma = false;
for (j = 0; j < vm->def->blkio.ndevices; j++) { for (j = 0; j < def->blkio.ndevices; j++) {
if (!vm->def->blkio.devices[j].rbps) if (!def->blkio.devices[j].rbps)
continue; continue;
if (comma) if (comma)
virBufferAddChar(&buf, ','); virBufferAddChar(&buf, ',');
else else
comma = true; comma = true;
virBufferAsprintf(&buf, "%s,%llu", virBufferAsprintf(&buf, "%s,%llu",
vm->def->blkio.devices[j].path, def->blkio.devices[j].path,
vm->def->blkio.devices[j].rbps); def->blkio.devices[j].rbps);
} }
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;
@ -2946,20 +2941,20 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
case 5: /* blkiotune.device_write_bps */ case 5: /* blkiotune.device_write_bps */
if (vm->def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool comma = false; bool comma = false;
for (j = 0; j < vm->def->blkio.ndevices; j++) { for (j = 0; j < def->blkio.ndevices; j++) {
if (!vm->def->blkio.devices[j].wbps) if (!def->blkio.devices[j].wbps)
continue; continue;
if (comma) if (comma)
virBufferAddChar(&buf, ','); virBufferAddChar(&buf, ',');
else else
comma = true; comma = true;
virBufferAsprintf(&buf, "%s,%llu", virBufferAsprintf(&buf, "%s,%llu",
vm->def->blkio.devices[j].path, def->blkio.devices[j].path,
vm->def->blkio.devices[j].wbps); def->blkio.devices[j].wbps);
} }
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;
@ -2973,7 +2968,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
break; break;
} }
} }
} else if (flags & VIR_DOMAIN_AFFECT_CONFIG) { } else if (persistentDef) {
for (i = 0; i < *nparams && i < LXC_NB_BLKIO_PARAM; i++) { for (i = 0; i < *nparams && i < LXC_NB_BLKIO_PARAM; i++) {
virTypedParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
val = 0; val = 0;
@ -3158,7 +3153,6 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
return ret; return ret;
} }