From nobody Fri May 3 08:47:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558602294; cv=none; d=zoho.com; s=zohoarc; b=THE39X/s6NjZyUYOx7078ny8t4o8mvcKSokRlESkYuwC9BGxTmpzThW/76EErsr+o5nW0dJ7hH7CGBS+AVKHwJWkDQz4mJjWoXzDxDOi1Vdoex/BjpiPteXG2sLnIC9TjwWz5Lj+m1bZDKchhpCwRZM8gL7lSD2X9thUqvRlr6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558602294; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=t5+y07chNhszXHuVmpgCJQQ7rCtERNb2zpo5v1DYVjM=; b=f/TZXrlFOqQ5U8X6c7+gpuAIepCjoUlwCNXoSwKESiu6Msa5D9xUwZy1/Xq8ATkgZKQVlr8quoUaVW7VwCZLAoCPyXWmR2Ru7ubMp2euPW31hfn3NZ1P0ivOnn68vbkL51p3SDZVLrVvBozzVAU9GBUytzU08FlR5dApE43fnJk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1558602294142386.457909931357; Thu, 23 May 2019 02:04:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DD803082B6B; Thu, 23 May 2019 09:04:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AEEC46767F; Thu, 23 May 2019 09:03:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3FA995B424; Thu, 23 May 2019 09:03:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4N93ZBY022070 for ; Thu, 23 May 2019 05:03:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4B7A19C4F; Thu, 23 May 2019 09:03:35 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EDD019695 for ; Thu, 23 May 2019 09:03:33 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 23 May 2019 11:03:29 +0200 Message-Id: <4d9d0ff04ddc29bf41123129d2682fc47d1c1947.1558602209.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemuProcessLaunch: Return earlier if spawning qemu failed X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 23 May 2019 09:04:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: J=C3=A1n Tomko --- 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, =20 /* wait for qemu process to show up */ if (rv =3D=3D 0) { - if (virPidFileReadPath(priv->pidfile, &vm->pid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); - rv =3D -1; + if ((rv =3D virPidFileReadPath(priv->pidfile, &vm->pid)) < 0) { + virReportSystemError(-rv, + _("Domain %s didn't show up"), + vm->def->name); + goto cleanup; } VIR_DEBUG("QEMU vm=3D%p name=3D%s running with pid=3D%lld", vm, vm->def->name, (long long)vm->pid); } else { VIR_DEBUG("QEMU vm=3D%p name=3D%s failed to spawn", vm, vm->def->name); + goto cleanup; } =20 VIR_DEBUG("Writing early domain status to disk"); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list