From nobody Sat Feb 7 07:38:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; 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 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725627211212523.6157584538049; Fri, 6 Sep 2024 05:53:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 19E8F181E; Fri, 6 Sep 2024 08:53:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4C8221800; Fri, 6 Sep 2024 08:53:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 486879CE; Fri, 6 Sep 2024 08:53:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CC8DE165 for ; Fri, 6 Sep 2024 08:53:12 -0400 (EDT) Received: from mx-prod-mc-04.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-310-YsaIX5sEMu6GQCSvM2Imyg-1; Fri, 06 Sep 2024 08:53:11 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 780C219560B5 for ; Fri, 6 Sep 2024 12:53:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 64E093000236 for ; Fri, 6 Sep 2024 12:53:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725627192; 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=ZzNol1JBRTC89W5h2iBMom6u5zgJiesSeBMayW/Au5w=; b=U9lZwh4XZAZ+uwcPVSCpK1jX1jKKYn3YzLCXxmUe5xoeOHp/Xon0XNHcbr1HGRVi6WrtPq Z0xR0ujbdxP4B/Bw5rnrI1v0u6Y6f9czBWshFM+ROEDaKms1n3SceyKUHq0UgW42pP9q7C iQ/rJ7Ags/A0zhsFJ9x6QHvtqr/Qy+U= X-MC-Unique: YsaIX5sEMu6GQCSvM2Imyg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH] qemuBackupDiskDataCleanupOne: Don't skip rest of cleanup if we can't enter monitor Date: Fri, 6 Sep 2024 14:53:07 +0200 Message-ID: <274a09854bbf4bb16c3745ffb9ae1e142e0d7914.1725627187.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HKXKOFCH6EQ7NDILPAEUGBDMP364MIFB X-Message-ID-Hash: HKXKOFCH6EQ7NDILPAEUGBDMP364MIFB X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725627211966116600 Content-Type: text/plain; charset="utf-8" Recent fix to use the proper 'async' monitor function would cause libvirt to leak some of the objects it's supposed to clean up in other places besides qemu. Don't skip the whole function on failure to enter the job but just the monitor section. Fixes: 9b22c25548aa658acdeac2269ddae32584df32d8 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_backup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 5eb2cbe306..f64639d501 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -125,10 +125,10 @@ qemuBackupDiskDataCleanupOne(virDomainObj *vm, if (!dd->started) { if (dd->added) { - if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_BACKUP) <= 0) - return; - qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->sr= cdata[0]); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_BACKUP) = =3D=3D 0) { + qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata= ->srcdata[0]); + qemuDomainObjExitMonitor(vm); + } } if (dd->created) { --=20 2.46.0