10:48 a.m.
Peter Krempa (2):
qemu: vcpupin: Extract live vcpupin setting into a separate function
qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags
src/qemu/qemu_driver.c | 163 +++++++++++++++++++++++++++----------------------
1 file changed, 89 insertions(+), 74 deletions(-)
--
2.6.2
10:48 a.m.
New subject: [libvirt] [PATCH v2 1/2] qemu: vcpupin: Extract live vcpupin setting into a separate function
The function was now beyond maintainability.
---
src/qemu/qemu_driver.c | 134 ++++++++++++++++++++++++++++---------------------
1 file changed, 78 insertions(+), 56 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 72ed3c0..3d45ce3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4973,6 +4973,82 @@ qemuDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
static int
+qemuDomainPinVcpuLive(virDomainObjPtr vm,
+ virDomainDefPtr def,
+ int vcpu,
+ virQEMUDriverPtr driver,
+ virQEMUDriverConfigPtr cfg,
+ virBitmapPtr cpumap)
+{
+ virDomainVcpuInfoPtr vcpuinfo;
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ virCgroupPtr cgroup_vcpu = NULL;
+ char *str = NULL;
+ virObjectEventPtr event = NULL;
+ char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] = "";
+ virTypedParameterPtr eventParams = NULL;
+ int eventNparams = 0;
+ int eventMaxparams = 0;
+ int ret = -1;
+
+ if (!qemuDomainHasVcpuPids(vm)) {
+ virReportError(VIR_ERR_OPERATION_INVALID,
+ "%s", _("cpu affinity is not supported"));
+ goto cleanup;
+ }
+
+ if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu))) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("vcpu %d is out of range of live cpu count %d"),
+ vcpu, virDomainDefGetVcpusMax(def));
+ goto cleanup;
+ }
+
+ if (vcpuinfo->online) {
+ /* Configure the corresponding cpuset cgroup before set affinity. */
+ if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
+ if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu,
+ false, &cgroup_vcpu) < 0)
+ goto cleanup;
+ if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0)
+ goto cleanup;
+ }
+
+ if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), cpumap) < 0)
+ goto cleanup;
+ }
+
+ virBitmapFree(vcpuinfo->cpumask);
+ vcpuinfo->cpumask = cpumap;
+ cpumap = NULL;
+
+ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps)
< 0)
+ goto cleanup;
+
+ if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH,
+ VIR_DOMAIN_TUNABLE_CPU_VCPUPIN, vcpu) < 0) {
+ goto cleanup;
+ }
+
+ str = virBitmapFormat(vcpuinfo->cpumask);
+ if (virTypedParamsAddString(&eventParams, &eventNparams,
+ &eventMaxparams, paramField, str) < 0)
+ goto cleanup;
+
+ event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams);
+
+ ret = 0;
+
+ cleanup:
+ virBitmapFree(cpumap);
+ virCgroupFree(&cgroup_vcpu);
+ VIR_FREE(str);
+ qemuDomainEventQueue(driver, event);
+ return ret;
+}
+
+
+static int
qemuDomainPinVcpuFlags(virDomainPtr dom,
unsigned int vcpu,
unsigned char *cpumap,
@@ -4984,21 +5060,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainObjPtr vm;
virDomainDefPtr def;
virDomainDefPtr persistentDef;
- virCgroupPtr cgroup_vcpu = NULL;
int ret = -1;
- qemuDomainObjPrivatePtr priv;
virBitmapPtr pcpumap = NULL;
virBitmapPtr pcpumaplive = NULL;
virBitmapPtr pcpumappersist = NULL;
- virDomainVcpuInfoPtr vcpuinfolive = NULL;
virDomainVcpuInfoPtr vcpuinfopersist = NULL;
virQEMUDriverConfigPtr cfg = NULL;
- virObjectEventPtr event = NULL;
- char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] = "";
- char *str = NULL;
- virTypedParameterPtr eventParams = NULL;
- int eventNparams = 0;
- int eventMaxparams = 0;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -5017,15 +5084,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
goto endjob;
- priv = vm->privateData;
-
- if (def && !(vcpuinfolive = virDomainDefGetVcpu(def, vcpu))) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("vcpu %d is out of range of live cpu count %d"),
- vcpu, virDomainDefGetVcpus(def));
- goto endjob;
- }
-
if (persistentDef &&
!(vcpuinfopersist = virDomainDefGetVcpu(persistentDef, vcpu))) {
virReportError(VIR_ERR_INVALID_ARG,
@@ -5048,44 +5106,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto endjob;
if (def) {
- if (!qemuDomainHasVcpuPids(vm)) {
- virReportError(VIR_ERR_OPERATION_INVALID,
- "%s", _("cpu affinity is not
supported"));
+ if (qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumaplive) < 0) {
+ pcpumaplive = NULL;
goto endjob;
}
- if (vcpuinfolive->online) {
- /* Configure the corresponding cpuset cgroup before set affinity. */
- if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
- if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu,
- false, &cgroup_vcpu) < 0)
- goto endjob;
- if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0)
- goto endjob;
- }
-
- if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), pcpumap) < 0)
- goto endjob;
- }
-
- virBitmapFree(vcpuinfolive->cpumask);
- vcpuinfolive->cpumask = pcpumaplive;
pcpumaplive = NULL;
-
- if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps)
< 0)
- goto endjob;
-
- if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH,
- VIR_DOMAIN_TUNABLE_CPU_VCPUPIN, vcpu) < 0) {
- goto endjob;
- }
-
- str = virBitmapFormat(pcpumap);
- if (virTypedParamsAddString(&eventParams, &eventNparams,
- &eventMaxparams, paramField, str) < 0)
- goto endjob;
-
- event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
}
if (persistentDef) {
@@ -5103,11 +5129,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm);
cleanup:
- if (cgroup_vcpu)
- virCgroupFree(&cgroup_vcpu);
virDomainObjEndAPI(&vm);
- qemuDomainEventQueue(driver, event);
- VIR_FREE(str);
virBitmapFree(pcpumap);
virBitmapFree(pcpumaplive);
virBitmapFree(pcpumappersist);
--
2.6.2
10:48 a.m.
New subject: [libvirt] [PATCH v2 2/2] qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags
Now that the function was extracted we can get rid of some temp
variables. Additionally formatting of the bitmap string for the event
code should be checked.
---
src/qemu/qemu_driver.c | 41 +++++++++++++++++------------------------
1 file changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3d45ce3..e9d1d39 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4980,6 +4980,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
virQEMUDriverConfigPtr cfg,
virBitmapPtr cpumap)
{
+ virBitmapPtr tmpmap = NULL;
virDomainVcpuInfoPtr vcpuinfo;
qemuDomainObjPrivatePtr priv = vm->privateData;
virCgroupPtr cgroup_vcpu = NULL;
@@ -5004,6 +5005,12 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
goto cleanup;
}
+ if (!(tmpmap = virBitmapNewCopy(cpumap)))
+ goto cleanup;
+
+ if (!(str = virBitmapFormat(cpumap)))
+ goto cleanup;
+
if (vcpuinfo->online) {
/* Configure the corresponding cpuset cgroup before set affinity. */
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
@@ -5019,8 +5026,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
}
virBitmapFree(vcpuinfo->cpumask);
- vcpuinfo->cpumask = cpumap;
- cpumap = NULL;
+ vcpuinfo->cpumask = tmpmap;
+ tmpmap = NULL;
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps)
< 0)
goto cleanup;
@@ -5030,7 +5037,6 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
goto cleanup;
}
- str = virBitmapFormat(vcpuinfo->cpumask);
if (virTypedParamsAddString(&eventParams, &eventNparams,
&eventMaxparams, paramField, str) < 0)
goto cleanup;
@@ -5040,7 +5046,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
ret = 0;
cleanup:
- virBitmapFree(cpumap);
+ virBitmapFree(tmpmap);
virCgroupFree(&cgroup_vcpu);
VIR_FREE(str);
qemuDomainEventQueue(driver, event);
@@ -5062,9 +5068,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainDefPtr persistentDef;
int ret = -1;
virBitmapPtr pcpumap = NULL;
- virBitmapPtr pcpumaplive = NULL;
- virBitmapPtr pcpumappersist = NULL;
- virDomainVcpuInfoPtr vcpuinfopersist = NULL;
+ virDomainVcpuInfoPtr vcpuinfo = NULL;
virQEMUDriverConfigPtr cfg = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -5085,7 +5089,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto endjob;
if (persistentDef &&
- !(vcpuinfopersist = virDomainDefGetVcpu(persistentDef, vcpu))) {
+ !(vcpuinfo = virDomainDefGetVcpu(persistentDef, vcpu))) {
virReportError(VIR_ERR_INVALID_ARG,
_("vcpu %d is out of range of persistent cpu count
%d"),
vcpu, virDomainDefGetVcpus(persistentDef));
@@ -5101,23 +5105,14 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto endjob;
}
- if ((def && !(pcpumaplive = virBitmapNewCopy(pcpumap))) ||
- (persistentDef && !(pcpumappersist = virBitmapNewCopy(pcpumap))))
+ if (def &&
+ qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap) < 0)
goto endjob;
- if (def) {
- if (qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumaplive) < 0) {
- pcpumaplive = NULL;
- goto endjob;
- }
-
- pcpumaplive = NULL;
- }
-
if (persistentDef) {
- virBitmapFree(vcpuinfopersist->cpumask);
- vcpuinfopersist->cpumask = pcpumappersist;
- pcpumappersist = NULL;
+ virBitmapFree(vcpuinfo->cpumask);
+ vcpuinfo->cpumask = pcpumap;
+ pcpumap = NULL;
ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
goto endjob;
@@ -5131,8 +5126,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
cleanup:
virDomainObjEndAPI(&vm);
virBitmapFree(pcpumap);
- virBitmapFree(pcpumaplive);
- virBitmapFree(pcpumappersist);
virObjectUnref(cfg);
return ret;
}
--
2.6.2
12:55 p.m.
On 03/09/2016 04:48 AM, Peter Krempa wrote:
Peter Krempa (2):
qemu: vcpupin: Extract live vcpupin setting into a separate function
qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags
src/qemu/qemu_driver.c | 163 +++++++++++++++++++++++++++----------------------
1 file changed, 89 insertions(+), 74 deletions(-)
ACK series,
John
3115
days inactive
3116
days old
3 comments
2 participants
participants (2)
-
John Ferlan -
Peter Krempa