|
 |
9119d9 |
From d9be878c70729eec8350e3fcc0c79ef034e1a3a5 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <d9be878c70729eec8350e3fcc0c79ef034e1a3a5@dist-git>
|
|
|
9119d9 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Date: Thu, 18 Sep 2014 09:29:59 -0400
|
|
|
9119d9 |
Subject: [PATCH] qemu_cgroup: Adjust spacing around incrementor
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1101574
|
|
|
9119d9 |
|
|
|
9119d9 |
Change "i+1" to "i + 1"
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit 500c91c57dafc7c4405e993bbb5261bb4ad43530)
|
|
|
9119d9 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_cgroup.c | 7 ++++---
|
|
|
9119d9 |
src/qemu/qemu_process.c | 2 +-
|
|
|
9119d9 |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
index c1d89bb..9d39370 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
@@ -1140,7 +1140,8 @@ qemuSetupCgroupForIOThreads(virDomainObjPtr vm)
|
|
|
9119d9 |
/* IOThreads are numbered 1..n, although the array is 0..n-1,
|
|
|
9119d9 |
* so we will account for that here
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
- if (virCgroupNewIOThread(priv->cgroup, i+1, true, &cgroup_iothread) < 0)
|
|
|
9119d9 |
+ if (virCgroupNewIOThread(priv->cgroup, i + 1, true,
|
|
|
9119d9 |
+ &cgroup_iothread) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
/* move the thread for iothread to sub dir */
|
|
|
9119d9 |
@@ -1159,13 +1160,13 @@ qemuSetupCgroupForIOThreads(virDomainObjPtr vm)
|
|
|
9119d9 |
* qemuSetupCgroupIOThreadsPin will fail. */
|
|
|
9119d9 |
for (j = 0; j < def->cputune.niothreadspin; j++) {
|
|
|
9119d9 |
/* IOThreads are numbered/named 1..n */
|
|
|
9119d9 |
- if (def->cputune.iothreadspin[j]->vcpuid != i+1)
|
|
|
9119d9 |
+ if (def->cputune.iothreadspin[j]->vcpuid != i + 1)
|
|
|
9119d9 |
continue;
|
|
|
9119d9 |
|
|
|
9119d9 |
if (qemuSetupCgroupIOThreadsPin(cgroup_iothread,
|
|
|
9119d9 |
def->cputune.iothreadspin,
|
|
|
9119d9 |
def->cputune.niothreadspin,
|
|
|
9119d9 |
- i+1) < 0)
|
|
|
9119d9 |
+ i + 1) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
break;
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
9119d9 |
index 274fc1b..a2304dc 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_process.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_process.c
|
|
|
9119d9 |
@@ -2357,7 +2357,7 @@ qemuProcessSetIOThreadsAffinity(virDomainObjPtr vm)
|
|
|
9119d9 |
/* set affinity only for existing vcpus */
|
|
|
9119d9 |
if (!(pininfo = virDomainVcpuPinFindByVcpu(def->cputune.iothreadspin,
|
|
|
9119d9 |
def->cputune.niothreadspin,
|
|
|
9119d9 |
- i+1)))
|
|
|
9119d9 |
+ i + 1)))
|
|
|
9119d9 |
continue;
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virProcessSetAffinity(priv->iothreadpids[i], pininfo->cpumask) < 0)
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.0
|
|
|
9119d9 |
|