]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Exit job on error path of qemuDomainSetVcpusFlags()
authorPeter Krempa <pkrempa@redhat.com>
Wed, 18 Feb 2015 17:05:21 +0000 (18:05 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 18 Feb 2015 17:26:47 +0000 (18:26 +0100)
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but
didn't adjust the jump labels so that the job would be terminated.

(cherry picked from commit 0df2f0404fdc87691c940565e42fbde83ce71679)

src/qemu/qemu_driver.c

index 82f016a77dbfa73e35bae6470d5b8d249e7c47f3..41b4f0d95a658df16c82fe6f7a74034c8386bcd2 100644 (file)
@@ -4604,13 +4604,13 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
 
     if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST)) {
         if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0)
-            goto cleanup;
+            goto endjob;
 
         if (!(all_nodes = virNumaGetHostNodeset()))
-            goto cleanup;
+            goto endjob;
 
         if (!(all_nodes_str = virBitmapFormat(all_nodes)))
-            goto cleanup;
+            goto endjob;
 
         if (virCgroupGetCpusetMems(cgroup_temp, &mem_mask) < 0 ||
             virCgroupSetCpusetMems(cgroup_temp, all_nodes_str) < 0)