From nobody Tue Aug 25 02:51:04 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=fail; 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=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1787066267; cv=none; d=zohomail.com; s=zohoarc; b=DqvOsosZr3W5rZByGcCjMpZUrBJXpEXApcKdldddeE7r4j2azXLQpHkDLRFfMP+NAkfwAaxh2SoYXNV0wQctS4POZkByHStNln7qjpum5vzO475wHPL+UHW3H/dC4fTez6fZQ7/TdN4dPHPQzO7JuOU6/sBm+PqB8KnUDvmDvrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787066267; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=hZYJjAH73GYMUNfAGxbTvGJiekKlHrSogAcv7ck90IM=; b=eF5WTKXE0vUNzSiwyNSzxnDHfCXHgW8BphFKiw4r2qCnqOb+fjB+ggNfqwD/JtVNnLoD0c6V1L2izyHAZaZ8tzhRj9Pn2S+FfAjuEoejaFeaxMD6zAbs3HqmVK4Y3dLIATG5g+mkQRTiNTVRrdLP94Mkf6/s7kozPB5N9CSj/L8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1787066267773977.8870934279546; Tue, 18 Aug 2026 08:17:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8E1473F332; Tue, 18 Aug 2026 11:17:45 -0400 (EDT) Received: from [172.19.199.13] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 61CFC41A03 for ; Tue, 18 Aug 2026 11:16:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B5A923FAB9; Tue, 18 Aug 2026 11:16:41 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 E3F4C3F86F for ; Tue, 18 Aug 2026 11:16:40 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-121-RBt7TUzmPBaR2wtVS7ZobQ-1; Tue, 18 Aug 2026 11:16:36 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 852021956071 for ; Tue, 18 Aug 2026 15:16:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.24.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D1D903000239 for ; Tue, 18 Aug 2026 15:16:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787066200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZYJjAH73GYMUNfAGxbTvGJiekKlHrSogAcv7ck90IM=; b=UnEXKIba+CDVuitwKyYsA3vblAVsn7Jma7YCs3VT+PLykdwTlR/+ulE1VDgG96SaH1BEZQ XVNh6VCuKKr3cRVBDZ9y6qT5xzUPIgi7snLNeJs/6do5jhYvbiBcySLyFksNMJ2JeNjCIz dpY6p8LmHV+yGZNbRx5PvD+izVSv1bc= X-MC-Unique: RBt7TUzmPBaR2wtVS7ZobQ-1 X-Mimecast-MFC-AGG-ID: RBt7TUzmPBaR2wtVS7ZobQ_1787066195 To: devel@lists.libvirt.org Subject: [PATCH] qemuDomainRestoreInternal: Preserve error on cleanup path Date: Tue, 18 Aug 2026 17:16:33 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9SHAZqxNgZLQFdE_PO79WkuSMhkx4Wms5k6I5X45elI_1787066195 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XOX24B26JYQQNFZ4ZZHIFWBG5KBHGADK X-Message-ID-Hash: XOX24B26JYQQNFZ4ZZHIFWBG5KBHGADK X-MailFrom: pkrempa@redhat.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 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1787066269238158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Preserve the error on cleanup path as cleanup of the 'libivrt_iohelper' process may overwrite it with an unactionable error, such as when attempting to restore a save image while the VM is already running: $ virsh list Id Name State -------------------------- 9 cd running $ virsh restore /tmp/cd.save error: Failed to restore domain from /tmp/cd.save error: internal error: Child process (LIBVIRT_LOG_OUTPUTS=3D1:stderr /hom= e/pipo/build/libvirt/gcc/src/libvirt_iohelper /tmp/cd.save 0) unexpected fa= tal signal 13 After this patch the original error is reported: $ virsh restore /tmp/cd.save error: Failed to restore domain from /tmp/cd.save error: Requested operation is not valid: domain 'cd' is already active Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander Reviewed-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 61d95bfbbf..25ba6695bb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5985,6 +5985,7 @@ qemuDomainRestoreInternal(virQEMUDriver *driver, bool sparse =3D false; bool bypass_cache =3D (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) !=3D 0; g_autoptr(qemuMigrationParams) restoreParams =3D NULL; + virErrorPtr save_err =3D NULL; virCheckFlags(QEMU_DOMAIN_RESTORE_FLAGS, -1); @@ -6109,6 +6110,7 @@ qemuDomainRestoreInternal(virQEMUDriver *driver, qemuProcessEndJob(vmNew); cleanup: + virErrorPreserveLast(&save_err); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) ret =3D -1; @@ -6117,6 +6119,7 @@ qemuDomainRestoreInternal(virQEMUDriver *driver, if (vmNew && ret < 0) qemuDomainRemoveInactive(vmNew, 0, false); virDomainObjEndAPI(&vmNew); + virErrorRestore(&save_err); return ret; } --=20 2.55.0