[libvirt] [PATCH] qemuProcessLaunch: Return earlier if spawning qemu failed

If spawning qemu fails then we report an error and proceed to writing status XML onto the disk. This is unnecessary as we are sure that the domain is not running. At the same time, if virPidFileReadPath() fails it returns -errno. Use it in the error message. It may explain what went wrong. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90466771cd..5b5864c021 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6624,16 +6624,18 @@ qemuProcessLaunch(virConnectPtr conn, /* wait for qemu process to show up */ if (rv == 0) { - if (virPidFileReadPath(priv->pidfile, &vm->pid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); - rv = -1; + if ((rv = virPidFileReadPath(priv->pidfile, &vm->pid)) < 0) { + virReportSystemError(-rv, + _("Domain %s didn't show up"), + vm->def->name); + goto cleanup; } VIR_DEBUG("QEMU vm=%p name=%s running with pid=%lld", vm, vm->def->name, (long long)vm->pid); } else { VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", vm, vm->def->name); + goto cleanup; } VIR_DEBUG("Writing early domain status to disk"); -- 2.21.0

On Thu, May 23, 2019 at 11:03:29AM +0200, Michal Privoznik wrote:
If spawning qemu fails then we report an error and proceed to writing status XML onto the disk. This is unnecessary as we are sure that the domain is not running.
At the same time, if virPidFileReadPath() fails it returns -errno. Use it in the error message. It may explain what went wrong.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko
-
Michal Privoznik