]> xenbits.xensource.com Git - 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:17:54 +0000 (18:17 +0100)
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but
didn't adjust the jump labels so that the job would be terminated.

src/qemu/qemu_driver.c

index 1bbbe9bc87d86857e2ccd63f7e4e6df4e911fb54..8f0cf2bd5ae02ef86150c79d84232d61a57c8406 100644 (file)
@@ -4716,13 +4716,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)