From nobody Fri Dec 27 12:11:23 2024 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 1732634309410564.1294756955995; Tue, 26 Nov 2024 07:18:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 369E51BF6; Tue, 26 Nov 2024 10:18:16 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7DD4518B5; Tue, 26 Nov 2024 10:17:11 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E25161C28; Tue, 26 Nov 2024 10:17:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 2C0071BFA for ; Tue, 26 Nov 2024 10:16:54 -0500 (EST) Received: from mx-prod-mc-05.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-321-_jk0BmqBMySdSE_QOcM1DA-1; Tue, 26 Nov 2024 10:16:52 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8171E1944EBE for ; Tue, 26 Nov 2024 15:16:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 52FB3196BE85 for ; Tue, 26 Nov 2024 15:16:29 +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=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,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=1732634213; 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=xggZ4LTbYJ+M/sj3iZYiG2FO14Hn8Jtvr9P2jVjwakg=; b=FIa0tTEECkZAzyRmFWGqOwIwZz9I+E13rbk2MpjXXL+/lPJrENm1HZCNUH79Gd3/J+ep+Q rhQpjjkSDtkOLXV+oA08UYFQrAmYxsQij+G/vUjDbbdFx2cc1MrQIv6e1malZ1hh7yF0JA mfKkUrnFB/hrKcbh3DWLBLYzTBs2s/o= X-MC-Unique: _jk0BmqBMySdSE_QOcM1DA-1 X-Mimecast-MFC-AGG-ID: _jk0BmqBMySdSE_QOcM1DA From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 5/8] qemu: snapshot: Change 'data-file' to read-only after snapshot Date: Tue, 26 Nov 2024 16:16:16 +0100 Message-ID: <0894fcc76e85f22211f6c76497e6d99065c3d4ad.1732633990.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _DJvzVQeeL56dZKJvzWfFhkncBAs7z_np-lkX56uLFE_1732634210 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: B4NGSIQP2TNMI7K6QKAFCG4X3BLEADE3 X-Message-ID-Hash: B4NGSIQP2TNMI7K6QKAFCG4X3BLEADE3 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: 1732634310298019100 Content-Type: text/plain; charset="utf-8" For the reason outlined in previous commit qemu doesn't do this automatically. Handle it manually after the snapshot. Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5b3aadcbf0..f880d1eeec 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1434,12 +1434,14 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *d= omdisk, * qemuSnapshotDiskUpdateSource: * @vm: domain object * @dd: snapshot disk data object + * @asyncJob: async job type * * Updates disk definition after a successful snapshot. */ static void qemuSnapshotDiskUpdateSource(virDomainObj *vm, - qemuSnapshotDiskData *dd) + qemuSnapshotDiskData *dd, + virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; @@ -1451,6 +1453,11 @@ qemuSnapshotDiskUpdateSource(virDomainObj *vm, if (qemuSecurityMoveImageMetadata(driver, vm, dd->disk->src, dd->src) = < 0) VIR_WARN("Unable to move disk metadata on vm %s", vm->def->name); + /* if the original image has a data-file turn it read-only */ + if (dd->disk->src->dataFileStore) { + ignore_value(qemuBlockReopenReadOnly(vm, dd->disk->src->dataFileSt= ore, asyncJob)); + } + /* unlock the write lock on the original image as qemu will no longer = write to it */ virDomainLockImageDetach(driver->lockManager, vm, dd->disk->src); @@ -1470,6 +1477,7 @@ qemuSnapshotDiskUpdateSource(virDomainObj *vm, dd->persistsrc->backingStore =3D g_steal_pointer(&dd->persistdisk-= >src); dd->persistdisk->src =3D g_steal_pointer(&dd->persistsrc); } + } @@ -1498,7 +1506,7 @@ qemuSnapshotDiskCreate(qemuSnapshotDiskContext *snapc= txt) virDomainAuditDisk(snapctxt->vm, dd->disk->src, dd->src, "snapshot= ", rc >=3D 0); if (rc =3D=3D 0) - qemuSnapshotDiskUpdateSource(snapctxt->vm, dd); + qemuSnapshotDiskUpdateSource(snapctxt->vm, dd, snapctxt->async= Job); } if (rc < 0) --=20 2.47.0