]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
lxc: fix starting a domain with non-strict numa memory mode
authorLuyao Huang <lhuang@redhat.com>
Mon, 20 Apr 2015 13:33:31 +0000 (15:33 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 20 Apr 2015 14:00:23 +0000 (16:00 +0200)
 # virsh -c lxc:/// start helloworld
 error: Failed to start domain helloworld
 error: internal error: guest failed to start: Unknown
 failure in libvirt_lxc startup

Return success when there are no cpuset.mems to be set,
instead of failing without setting an error.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 930e8697a5b66989fbf56a5e38cfaf1378a1c59e)

src/lxc/lxc_cgroup.c

index b13fede81dd13a98294bdb09c5ebc1b05a9b4633..ba64b69601c95a8abc08f2953f03f9ce405498bc 100644 (file)
@@ -82,8 +82,10 @@ static int virLXCCgroupSetupCpusetTune(virDomainDefPtr def,
     }
 
     if (virDomainNumatuneGetMode(def->numa, -1) !=
-        VIR_DOMAIN_NUMATUNE_MEM_STRICT)
+        VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
+        ret = 0;
         goto cleanup;
+    }
 
     if (virDomainNumatuneMaybeFormatNodeset(def->numa, nodemask,
                                             &mask, -1) < 0)