[libvirt] [PATCH] qemu: Exit job on error path of qemuDomainSetVcpusFlags()
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but didn't adjust the jump labels so that the job would be terminated. --- Notes: I'm already wearing my pink fluffy bunny ears of shame as I've acked that patch. src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1bbbe9b..8f0cf2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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) -- 2.2.2
On Wed, Feb 18, 2015 at 06:08:36PM +0100, Peter Krempa wrote:
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but didn't adjust the jump labels so that the job would be terminated. ---
Notes: I'm already wearing my pink fluffy bunny ears of shame as I've acked that patch.
src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1bbbe9b..8f0cf2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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) -- 2.2.2
ACK, and shame on me for sending that patch. Pavel
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 18.02.2015 18:08, Peter Krempa wrote:
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but didn't adjust the jump labels so that the job would be terminated. ---
Notes: I'm already wearing my pink fluffy bunny ears of shame as I've acked that patch.
src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Please make sure you've pushed the patch into the the maint branch as well. Michal
On Wed, Feb 18, 2015 at 18:18:16 +0100, Michal Privoznik wrote:
On 18.02.2015 18:08, Peter Krempa wrote:
Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but didn't adjust the jump labels so that the job would be terminated. ---
Notes: I'm already wearing my pink fluffy bunny ears of shame as I've acked that patch.
src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Please make sure you've pushed the patch into the the maint branch as well.
Pushed both to master and to v1.2.12-maint.
Michal
Peter
participants (3)
-
Michal Privoznik -
Pavel Hrdina -
Peter Krempa