From nobody Sun Nov 22 16:11:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790706844; cv=none; d=zohomail.com; s=zohoarc; b=VK1Ii1NNtCvo7ZMYdytx903n450QOB653J9WwxURchUen8NG2j4m0rRtngzJhg3wW/NoxwFHbwpcEQhx6T0OWrHOeHuPM6IGbOj3ELicG1Cn0j0hMbJcwWvEP6ltBo0CFMFV6HcYmtX+EQ9ZisfXDu72dwlvha4mICvapNO94Ng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790706844; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=3g5lnZZ3dkDEDwLUtIQ6j7rgGR1GRfEdlqLcOL07gG8=; b=OtbMDrGEnmjFrP6XFWAxKsxlaMdZcMHPSpu6V3Ika2h0Jpnyyt0l1xgElk2g9JtAg9bM+Z793l/R+XjRHTRDHpnzniu+Ady+cffJcfIOWr0p5sDMD1nGtB+fjNHpIoEEpfOYPTLm/LZ5KCIvgRAjLqbsXOCYV1vygvk936bWzlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1790706844477627.7070918029924; Tue, 29 Sep 2026 11:34:04 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EE9BA3F942; Tue, 29 Sep 2026 14:34:02 -0400 (EDT) Received: from [172.19.199.16] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id C0BB14181F; Tue, 29 Sep 2026 14:32:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 76FCF3F31F; Tue, 29 Sep 2026 14:32:49 -0400 (EDT) Received: from mail-ed2-x10.google.com (mail-ed2-x10.google.com [IPv6:2a00:1450:4864:33::10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9CB6F3F313 for ; Tue, 29 Sep 2026 14:32:48 -0400 (EDT) Received: by mail-ed2-x10.google.com with SMTP id 4fb4d7f45d1cf-6a60591ae54so7275208a12.3 for ; Tue, 29 Sep 2026 11:32:48 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-25f6-628e-6064-de9b.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:25f6:628e:6064:de9b]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6acee3c47d0sm78490a12.25.2026.09.29.11.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2026 11:32:46 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790706767; x=1791311567; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=3g5lnZZ3dkDEDwLUtIQ6j7rgGR1GRfEdlqLcOL07gG8=; b=SK8RnhE0YIBwWqNTnFHGZ1aYjD8fWeGhPjJXFl2PX8PYPkvxCodag61CMj3eNQXAfN S7GxjbRHI9NyO+TBZAHV+GGldYM+/2tISv3fQb1wkauuDTQXtKyAWTSSxI1fvwnogm/J 4pLJEddNbQNDvyNXQmALt23nYlF2cqWPxpafT8XiIe6g/TK3BMzp8ZS9mUnwOJm4UdQx KvkyAVd9S85/GwvTRKt9VaMK3F6Dtd6Z8U05Ln7p6noyzJGdx2z0VhTA2MFpZs4CU1Ee j8pWAgR4qcpKA68BwrpmgOuNU45fp2Ee236qOxZPRvSn6NiSlWN21BkCQTM3OR8Rytu4 OiiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790706767; x=1791311567; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3g5lnZZ3dkDEDwLUtIQ6j7rgGR1GRfEdlqLcOL07gG8=; b=vKD9FOkgBycPc6K7PbTUaRtUn9e6oskrZT7mzm0DBbnDCrJdcFDYC4sDEZBEEuZjwd NjuuQbLhCBu3aJWsVreJCXuNCzTRIimuYy+pJEbUd+ALqzLTGFPVACbNICnRcyJgT3iD yAMkmapcd0k7j1gaJ0xn6C9uCGIq7Q+f0xEh8oCj3ABOaukAkZ6c578c8n3rOHNQJUsr QHxUd9+OSMdJxdmuo+h5ea+zP3sFJ1r5xegbnf9FQFSf9I//cSiFIEIosVCFUBxfhI02 iFw+pR6oC3U7Lr1z9t4ZYcSJqPCr9SS8pRltyKn2vqyMq6ogxMpIbEH02lzGHHY3BFpl DOLw== X-Gm-Message-State: AFq9FYJQqG/a1SWnt3H1ars2bLB0nQgDLHJ5K7FUWdr96fSFLvUwx4DF VgbN2hqm3RkcqLZKr16lfnTu7G+x8F9eKMbem01/en9d+68X+97I3QyWUhsZooWG X-Gm-Gg: AYBFou1XdjjP/XiLOpBYayEy1xCrBBZNN09F/Y8tJ2/sM5yDIK045C6y26AieUzt+/9 wcbQSZ1LaDqgrIPSoknKQaPcunEAL7emBQhtaXyw4rNmgJ7w7zzsXLRIdNDcYIDzSgkjMGdya2i YD6N31g5O3JVBVpKOi+OoZEfgXuIykrSObCdmsBxoAkrozDzxieGQsF0gFSpXRDpSw5sLOsIw4c XZwSLR5Z5EMnFujX60W0ZZjYHmCPeR4OMr4DjIOb8JOH9B0CfjU3XOzO6nybUc0ZTz3pgu4I2hO bGGOThQ/o/6Y33nOTnNZq+F1olJkSYR5jExDh7JgVgatNJM4gNvu8YGF6YBjTw7hc+hwJo6TVbW bmkB6skyP6y6/glrj7KCqZQ3/SdF4HEHYtu2vo4ZgP12laF5VT3IYPaO2hbfhPqlpk53Eow1uyf VyjRDCNepzXDJ5fSnGHnUXci1zeXjBf+V41WIrmJwXCZ3HJMT4pZEl4vZc5znGPMMs3LC+w3r7l wy0zxuHYrRhZKIeTL8RzmHwF+1uGaUVMlHscTUb9dRKsvRtCbtpdkCyURvZuDOrl3xmYBEUX6+q Y2hhxrjg X-Received: by 2002:a05:6402:4403:b0:6ab:d416:d486 with SMTP id 4fb4d7f45d1cf-6abd416d9f9mr7071614a12.7.1790706766914; Tue, 29 Sep 2026 11:32:46 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH v2] bhyve: do not override domain startup errors Date: Tue, 29 Sep 2026 20:31:14 +0200 Message-ID: <20260929183114.352-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XYC3ZVYKCESEP5KT424LZUYVTRITDE4N X-Message-ID-Hash: XYC3ZVYKCESEP5KT424LZUYVTRITDE4N X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy , Michal Privoznik X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790706846036158500 Content-Type: text/plain; charset="utf-8" Make virBhyveProcessStopImpl() not override an error. It is called from various cleanup routines and should preserve the original error. Update virBhyveProcessStart() to preserve the original error around the STOPPED and RELEASE hooks. Additionally, relax error handling for devicemap removal in virBhyveProcessStartImpl(), since it is not critical enough to raise an error. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- Changes since v1: - Instead of trying to preserve errors in virBhyveProcessStartImpl(), update virBhyveProcessStopImpl() not to override errors. src/bhyve/bhyve_process.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 65cf61c578..a255b799b2 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -433,8 +433,8 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (devicemap !=3D NULL) { rc =3D unlink(devmap_file); if (rc < 0 && errno !=3D ENOENT) - virReportSystemError(errno, _("cannot unlink file '%1$s'"), - devmap_file); + VIR_WARN("cannot unlink file '%s': %s", + devmap_file, g_strerror(errno)); } =20 if (ret < 0) @@ -593,6 +593,8 @@ virBhyveProcessStart(bhyveConn *driver, virDomainRunningReason reason, unsigned int flags) { + virErrorPtr save_err =3D NULL; + if (virDomainObjSetDefTransient(driver->xmlopt, vm, NULL) < 0) return -1; =20 @@ -612,9 +614,11 @@ virBhyveProcessStart(bhyveConn *driver, return virBhyveProcessStartImpl(driver, vm, reason); =20 cleanup: + virErrorPreserveLast(&save_err); bhyveProcessStopHook(driver, vm, VIR_HOOK_BHYVE_OP_STOPPED); bhyveProcessStopHook(driver, vm, VIR_HOOK_BHYVE_OP_RELEASE); virDomainObjRemoveTransientDef(vm); + virErrorRestore(&save_err); =20 return -1; } @@ -660,6 +664,9 @@ virBhyveProcessStopImpl(struct _bhyveConn *driver, g_autoptr(virCommand) cmd =3D NULL; bhyveDomainObjPrivate *priv =3D vm->privateData; bool vm_started =3D false; + virErrorPtr save_err =3D NULL; + + virErrorPreserveLast(&save_err); =20 if (vm->pid !=3D 0) vm_started =3D true; @@ -667,14 +674,15 @@ virBhyveProcessStopImpl(struct _bhyveConn *driver, if (!forceCleanup) { if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); - return 0; + goto cleanup; } =20 if (!vm_started) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid PID %1$d for VM"), (int)vm->pid); - return -1; + ret =3D -1; + goto cleanup; } } =20 @@ -735,6 +743,8 @@ virBhyveProcessStopImpl(struct _bhyveConn *driver, if (restoreDef) virDomainObjRemoveTransientDef(vm); =20 + cleanup: + virErrorRestore(&save_err); return ret; } =20 --=20 2.55.0