Both are now pushed.
Peter Krempa (2):
qemu: Jump to correct label in qemuDomainPinIOThread
qemu: Fix double space in error message in qemuDomainGetVcpusFlags
src/qemu/qemu_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
2.4.1
Show replies by date
If virDomainObjGetDefs used in qemuDomainPinIOThread would fail the code
would jump to the 'cleanup' label after acquiring the job, thus the VM
would be locked forever.
Introduced in commit cac6d639.
---
src/qemu/qemu_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index eb07b7a..3a70b18 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5790,7 +5790,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
goto cleanup;
if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
- goto cleanup;
+ goto endjob;
if (!(pcpumap = virBitmapNewData(cpumap, maplen)))
goto endjob;
--
2.4.1
---
src/qemu/qemu_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3a70b18..43228fd 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5506,7 +5506,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("vCPU count provided by the guest agent can only be
"
- " requested for live domains"));
+ "requested for live domains"));
goto cleanup;
}
--
2.4.1