From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 20 Mar 2015 14:01:53 +0000 (+0100)
Subject: qemu: fix set vcpus on host without NUMA
X-Git-Tag: v1.2.14-rc1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cf1e11cc09212f71991f1061681ea0b1ee2bc1b;p=thirdparty%2Flibvirt.git

qemu: fix set vcpus on host without NUMA

We don't have to modify cpuset.mems on hosts without NUMA.  It also
fixes an error message that you get instead of success if you trying
update vcpus of a guest on a host without NUMA.

error: internal error: NUMA isn't available on this host

Signer-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4279af865a..2c55fb0a86 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4890,7 +4890,8 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
                                         &persistentDef) < 0)
         goto endjob;
 
-    if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST)) {
+    if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST) &&
+        virNumaIsAvailable()) {
         if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0)
             goto endjob;