From nobody Mon Feb 9 16:21:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560265216; cv=none; d=zoho.com; s=zohoarc; b=WCDkB4EOFxtE7BtzAF3m01pcSZ+OrA8B83Mu1ggtsTa/tKxNF75dNgeW8OkYTG0s1kAram+gZtLo/ftGqGmsrANviVgHuYOsS4U6zo2SRb4U4nLKv69kdKTJzWqtWlML/B9SVyniCIMlYgBSi/HQBmbpK2YJXSueaGxAmDdaCL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560265216; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=bEzeEfu1wOehtQtqZZslgQeY9+0BJxn4cQ6CafLiHWk=; b=GqWT3oz+9QQiJ6fQmcX9cOHiyoDJkrC8qPL/V/gPtcuiqyGrkTf+9SmGoKlhJfF2rnz5Gj20cy4BvmTcRpP47aCoRKGW5X5eHj5WEulc+H3sLrlERmNPiz4nOb6oJaPB9FYl3f1x6Dc+TfbFWaaWVkb8SfNHGkkvRImd7jMemsM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560265216528122.76158735005288; Tue, 11 Jun 2019 08:00:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D1D8308338F; Tue, 11 Jun 2019 15:00:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5629277A2; Tue, 11 Jun 2019 15:00:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4437B206D2; Tue, 11 Jun 2019 14:59:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5BEuWou000784 for ; Tue, 11 Jun 2019 10:56:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 280965B0A0; Tue, 11 Jun 2019 14:56:32 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F556600CC; Tue, 11 Jun 2019 14:56:31 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 11 Jun 2019 16:56:24 +0200 Message-Id: <729a91310edf8c9f900f3974abed6e34a1eb58c9.1560264958.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/3] qemu: domain: Allow overriding images to read-write in qemuDomainStorageSourceAccessAllow X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 11 Jun 2019 15:00:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In commit 76b9aba2ba6 I refactored how the function treats the readonly flag which introduced a bug when we'd not allow to force read-write state for an image. This created problems with blockjobs where we need to temporarily override images to read-write. Rename QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY to QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_ONLY and also introduce a complement QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_WRITE which will allow to force wire access. https://bugzilla.redhat.com/show_bug.cgi?id=3D1717768 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e521bd3982..595150708b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9305,12 +9305,14 @@ typedef enum { QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE =3D 1 << 0, /* operate on full backing chain rather than single image */ QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN =3D 1 << 1, - /* force permissions to read-only when allowing */ - QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY =3D 1 << 2, + /* force permissions to read-only/read-write when allowing */ + /* currently does not properly wrok with QEMU_DOMAIN_STORAGE_SOURCE_AC= CESS_CHAIN */ + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_ONLY =3D 1 << 2, + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_WRITE =3D 1 << 3, /* don't revoke permissions when modification has failed */ - QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE =3D 1 << 3, + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE =3D 1 << 4, /* VM already has access to the source and we are just modifying it */ - QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS =3D 1 << 4, + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS =3D 1 << 5, } qemuDomainStorageSourceAccessFlags; @@ -9344,9 +9346,12 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr= driver, bool revoke_namespace =3D false; bool revoke_lockspace =3D false; - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY) + if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_ONLY) src->readonly =3D true; + if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_WRITE) + src->readonly =3D false; + /* just tear down the disk access */ if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { virErrorPreserveLast(&orig_err); @@ -9491,7 +9496,9 @@ qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr d= river, qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_SKIP_REVOKE; if (readonly) - flags |=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY; + flags |=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_ONLY; + else + flags |=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_OVERRIDE_READ_WRITE; if (!newSource) flags |=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list