From nobody Fri Dec 19 19:13:59 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1742232574; cv=none; d=zohomail.com; s=zohoarc; b=AhMg9kx5c7D2SX6umv3LfRqpF1SA/lhgDu54BgCm0exgw1t0TAwhMF5H94Rvpo1RjAZMpPInvJxiTVRjUzXInmdQOSAdqyVvK1QFfcsbaYPJ6SxFfE5J3AC85bsvzz9CRMBaLgfzoENa+Fmn9mjt6qcuW0RSMCOUHFlUq2GjjNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742232574; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=y08TrRMA/tWFI/OyaSmLohNx6bJiBALH8fNyMfJ8EH8=; b=BEvzi616qCd2DpBQhuU2wrfj8dDS6RvNhK0qtXu+j9/srza1IsDIxSyLj4D0ASYe65HA3FlbiIJbCujTsgS5koWXqEEg+YrIzdDkFZT8XrWmIpLHVyAv4HppA9dJ48Rtfo3qOIPSBvsx8YvbTT5e/I3gm2hTL66pLeTYDmf6xMc= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1742232574503626.0713790089891; Mon, 17 Mar 2025 10:29:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7929023CD; Mon, 17 Mar 2025 13:29:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DEA1223A3; Mon, 17 Mar 2025 13:27:55 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 677C222C9; Mon, 17 Mar 2025 13:27:50 -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 9AE9222EC for ; Mon, 17 Mar 2025 13:27:43 -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-416-PcoulVe9Nw6VTey9gq9U9g-1; Mon, 17 Mar 2025 13:27:41 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 D5BFD1956051 for ; Mon, 17 Mar 2025 17:27:40 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E7A1180174E for ; Mon, 17 Mar 2025 17:27:39 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742232463; 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: in-reply-to:in-reply-to:references:references; bh=9tMNQPZLAGD4sEEkXE1A2gMCb+XjaWoHUc9cKSfxtzs=; b=fMQStgpOB+HNPGV57jzrqxlmTydj0+uISaa3uYnb/EXR7MxzoYYeArCuID2aKpOpZUN6Mn V/KirXvANNL/Du4tEdeWctQAQlxbfeOkZGW9ueCBNuD8r0ke+KH+db/ut/8ouyG4e+T6j2 pc7uIawFZu190CblmnerVnGDQLwsJMY= X-MC-Unique: PcoulVe9Nw6VTey9gq9U9g-1 X-Mimecast-MFC-AGG-ID: PcoulVe9Nw6VTey9gq9U9g_1742232461 To: devel@lists.libvirt.org Subject: [PATCH 4/5] qemuDomainChangeEjectableMedia: Separate rollback and success code paths Date: Mon, 17 Mar 2025 18:27:31 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ug9wXiEv3wIi3ZMy8BYnCICXz5IcH3m6HdLlfUrw7nI_1742232461 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IUNAPSZFQSA6NG6WOXRKEFAT2TJZOURD X-Message-ID-Hash: IUNAPSZFQSA6NG6WOXRKEFAT2TJZOURD 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1742232576509019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Do not use the rollback code path on success just to avoid extra call to qemuHotplugRemoveManagedPR. Rename the label and use it only when rolling back. Signed-off-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bb599d1505..d6de9afccd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -613,9 +613,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; virStorageSource *oldsrc =3D disk->src; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - bool managedpr =3D virStorageSourceChainHasManagedPR(oldsrc) || - virStorageSourceChainHasManagedPR(newsrc); - int ret =3D -1; int rc; if (diskPriv->blockjob && qemuBlockJobIsRunning(diskPriv->blockjob)) { @@ -627,49 +624,45 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, disk->src =3D newsrc; if (virDomainDiskTranslateSourcePool(disk) < 0) - goto cleanup; + goto rollback; if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0) - goto cleanup; + goto rollback; if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) - goto cleanup; + goto rollback; if (qemuDomainStorageSourceChainAccessAllow(driver, vm, newsrc) < 0) - goto cleanup; + goto rollback; if (qemuHotplugAttachManagedPR(vm, newsrc, VIR_ASYNC_JOB_NONE) < 0) - goto cleanup; + goto rollback; rc =3D qemuDomainChangeMediaBlockdev(vm, disk, oldsrc, newsrc, force); virDomainAuditDisk(vm, oldsrc, newsrc, "update", rc >=3D 0); if (rc < 0) - goto cleanup; + goto rollback; ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, olds= rc)); + if (virStorageSourceChainHasManagedPR(oldsrc)) + qemuHotplugRemoveManagedPR(vm, VIR_ASYNC_JOB_NONE); + /* media was changed, so we can remove the old media definition now */ g_clear_pointer(&oldsrc, virObjectUnref); + return 0; - ret =3D 0; - - cleanup: - /* undo changes to the new disk */ - if (ret < 0) { - ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, = newsrc)); - } + rollback: + ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, news= rc)); - /* remove PR manager object if unneeded */ - if (managedpr) + if (virStorageSourceChainHasManagedPR(newsrc)) qemuHotplugRemoveManagedPR(vm, VIR_ASYNC_JOB_NONE); /* revert old image do the disk definition */ - if (oldsrc) - disk->src =3D oldsrc; - - return ret; + disk->src =3D oldsrc; + return -1; } --=20 2.48.1