From nobody Mon Feb 9 06:50:27 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=1555598614; cv=none; d=zoho.com; s=zohoarc; b=ZABe/GJDATPWTF3BuY6khwdPO7lPfb8cuJUcrDsbvZ/QsYm7sSeD+huvcw0MZS844ZUzKybAinnJtQo0JFOwaPDOaWUMVE9d8AiNtFQxomvZyI9wcrBy6bMOL4PWI1LvdW5+AED3Kmfwx2E0nWE8B530xuk7eO3Xg8e7c3pYc28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598614; h=Content-Type:Content-Transfer-Encoding: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=wUTbCkV9jgnj/n979MlP7hWnegv4PO4GDLAVmtnESE8=; b=Viji0Zis0zT6VFG+9vyprXIKGJbqRQkHVsdm+ewilFi38jWXwy6/vO9tIliABhExy46DsNJsRJi+LRdavC60MPfTKGG3YZFStmNQ73xXGFL70VcgzBil1fh4MecFVpQgSIEZYdafF/++MXfUb1jZ+SW08W1YHYHjCyQLQcaQKec= 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 1555598614283739.9191989026841; Thu, 18 Apr 2019 07:43:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 785F230ADBDD; Thu, 18 Apr 2019 14:43:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 575C1608C8; Thu, 18 Apr 2019 14:43:32 +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 1FBAE181B9ED; Thu, 18 Apr 2019 14:43:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3IEhK6q020832 for ; Thu, 18 Apr 2019 10:43:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 687E360BF7; Thu, 18 Apr 2019 14:43:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E45B560BFC for ; Thu, 18 Apr 2019 14:43:19 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:07 +0200 Message-Id: <940c9866fae42ccde1a514c4701dc85cce85fd73.1555598423.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/12] qemu: Refactor/simplify 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.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 18 Apr 2019 14:43:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use qemuDomainStorageSourceAccessModify with correct flags to do the job. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 75d0b34e42..c2b96b825e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9399,33 +9399,15 @@ qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr= driver, bool readonly, bool newSource) { - bool was_readonly =3D elem->readonly; - virQEMUDriverConfigPtr cfg =3D NULL; - int ret =3D -1; - - cfg =3D virQEMUDriverGetConfig(driver); - - elem->readonly =3D readonly; - - if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, elem) = < 0) - goto cleanup; - - if (newSource && - qemuDomainNamespaceSetupDisk(vm, elem) < 0) - goto cleanup; - - if (qemuSetupImageCgroup(vm, elem) < 0) - goto cleanup; + qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_SKIP_REVOKE; - if (qemuSecuritySetImageLabel(driver, vm, elem, false) < 0) - goto cleanup; + if (readonly) + flags &=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY; - ret =3D 0; + if (!newSource) + flags &=3D QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS; - cleanup: - elem->readonly =3D was_readonly; - virObjectUnref(cfg); - return ret; + return qemuDomainStorageSourceAccessModify(driver, vm, elem, flags); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list