|
 |
7a3408 |
From 5804052866cb35179f3520d1b21238b49ee19018 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <5804052866cb35179f3520d1b21238b49ee19018@dist-git>
|
|
|
7a3408 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7a3408 |
Date: Tue, 14 Jul 2015 11:20:26 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemuDomainSetNumaParamsLive: Check for NUMA mode more wisely
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1232663
|
|
|
7a3408 |
|
|
|
7a3408 |
In one of my previous ptaches (bcd9a564) I've tried to fix the problem
|
|
|
7a3408 |
that we blindly assumed strict NUMA mode for guests. This led to
|
|
|
7a3408 |
several problems like us pinning a domain onto a nodeset via libnuma
|
|
|
7a3408 |
among with CGroups. Once the nodeset was changed by user, well, it did
|
|
|
7a3408 |
not result in desired effect. See the original commit for more info.
|
|
|
7a3408 |
But, the commit I wrote had a bug: when NUMA parameters are changed on
|
|
|
7a3408 |
a running domain we require domain to be strictly pinned onto a
|
|
|
7a3408 |
nodeset. Due to a typo a condition was mis-evaluated.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 1cf25f633414dd844601965174b81bc9eb207d6b)
|
|
|
7a3408 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_driver.c | 2 +-
|
|
|
7a3408 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
index fb42dae..47889d9 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_driver.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
@@ -10036,7 +10036,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm,
|
|
|
7a3408 |
size_t i = 0;
|
|
|
7a3408 |
int ret = -1;
|
|
|
7a3408 |
|
|
|
7a3408 |
- if (virDomainNumatuneGetMode(vm->def->numa, -1, &mode) < 0 ||
|
|
|
7a3408 |
+ if (virDomainNumatuneGetMode(vm->def->numa, -1, &mode) == 0 &&
|
|
|
7a3408 |
mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
|
|
|
7a3408 |
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
7a3408 |
_("change of nodeset for running domain "
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|