From nobody Mon Feb 9 05:29:23 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=1555598603; cv=none; d=zoho.com; s=zohoarc; b=ScueTKb+7zq/u+FKhGIG4t0SHioa06XsJ08VMoWpDfgl0tUsz4P4X8eBkeH3pAabTmVqVnLrRCTQWWocIqFnL1GV5uGHugXy+jYfpD9GWXveXkUhAZLnv6dxx/utbooLkR9c3V6tcH5liCwHdw2gB5YJJWzFZN2nb7Wppx34Uso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598603; 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=+s40EK13HwmFWCVVbzJ3D+IOUvEh7QUD97h1mHbNlds=; b=EonwuoA7wLkeBPf2BY6Exj1HkY8eAFypCOE2lnR8FVQVunnjZUkyKWQ7qNVQASiRRJgfRfLKS8b5LyICKfJ4s4qM8NOo6+WCEU6rAy2zKiv/BBZ4WzebEVWQRpf8zygHm+Aq/cSty1gwepx9Hbq/vhm6mHMvswPFc7pK7Kp2gkQ= 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 1555598603987153.9492364534733; Thu, 18 Apr 2019 07:43:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34F14285B1; Thu, 18 Apr 2019 14:43:22 +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 101B35D707; Thu, 18 Apr 2019 14:43:22 +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 CAD6F3FA48; Thu, 18 Apr 2019 14:43:21 +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 x3IEhB5L020739 for ; Thu, 18 Apr 2019 10:43:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 89B4C60BFC; Thu, 18 Apr 2019 14:43:11 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11F1D60BF7 for ; Thu, 18 Apr 2019 14:43:10 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:42:56 +0200 Message-Id: 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 01/12] qemu: Rename qemuDomainDiskChainElement(Revoke|Prepare) 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 18 Apr 2019 14:43:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use qemuDomainStorageSourceAccess(Allow|Revoke) instead. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 20 ++++++++++---------- src/qemu/qemu_domain.h | 16 ++++++++-------- src/qemu/qemu_driver.c | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 960aaff3c7..ce8f4a0dca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9212,15 +9212,15 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr d= isk, /** - * qemuDomainDiskChainElementRevoke: + * qemuDomainStorageSourceAccessRevoke: * * Revoke access to a single backing chain element. This restores the labe= ls, * removes cgroup ACLs for devices and removes locks. */ void -qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr elem) +qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr elem) { if (qemuTeardownImageCgroup(vm, elem) < 0) VIR_WARN("Failed to teardown cgroup for disk path %s", @@ -9238,7 +9238,7 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr dri= ver, /** - * qemuDomainDiskChainElementPrepare: + * qemuDomainStorageSourceAccessAllow: * @driver: qemu driver data * @vm: domain object * @elem: source structure to set access for @@ -9253,11 +9253,11 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr d= river, * backing chain) @newSource needs to be set to false. */ int -qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr elem, - bool readonly, - bool newSource) +qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr elem, + bool readonly, + bool newSource) { bool was_readonly =3D elem->readonly; virQEMUDriverConfigPtr cfg =3D NULL; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 06640a9510..9a48b5b69d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -770,14 +770,14 @@ int qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr= disk, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -void qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr elem); -int qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr elem, - bool readonly, - bool newSource); +void qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr elem); +int qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr elem, + bool readonly, + bool newSource); int qemuDomainCleanupAdd(virDomainObjPtr vm, qemuDomainCleanupCallback cb); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c443c881d5..b038bfc360 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15025,7 +15025,7 @@ struct _qemuDomainSnapshotDiskData { virStorageSourcePtr src; bool initialized; /* @src was initialized in the storage driver */ bool created; /* @src was created by the snapshot code */ - bool prepared; /* @src was prepared using qemuDomainDiskChainElementPr= epare */ + bool prepared; /* @src was prepared using qemuDomainStorageSourceAcces= sAllow */ virDomainDiskDefPtr disk; char *relPath; /* relative path component to fill into original disk */ @@ -15056,7 +15056,7 @@ qemuDomainSnapshotDiskDataFree(qemuDomainSnapshotDi= skDataPtr data, virStorageFileDeinit(data[i].src); if (data[i].prepared) - qemuDomainDiskChainElementRevoke(driver, vm, data[i].src); + qemuDomainStorageSourceAccessRevoke(driver, vm, data[i].sr= c); virObjectUnref(data[i].src); } @@ -15216,8 +15216,8 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDri= verPtr driver, } /* set correct security, cgroup and locking options on the new image */ - if (qemuDomainDiskChainElementPrepare(driver, vm, dd->src, false, true= ) < 0) { - qemuDomainDiskChainElementRevoke(driver, vm, dd->src); + if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, tru= e) < 0) { + qemuDomainStorageSourceAccessRevoke(driver, vm, dd->src); goto cleanup; } @@ -15314,7 +15314,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, continue; if (diskdata[i].prepared) - qemuDomainDiskChainElementRevoke(driver, vm, diskdata[i].s= rc); + qemuDomainStorageSourceAccessRevoke(driver, vm, diskdata[i= ].src); if (diskdata[i].created && virStorageFileUnlink(diskdata[i].src) < 0) @@ -17752,8 +17752,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuSecuritySetImageLabel(driver, vm, mirror, true) < 0) goto endjob; } else { - if (qemuDomainDiskChainElementPrepare(driver, vm, mirror, false, t= rue) < 0) { - qemuDomainDiskChainElementRevoke(driver, vm, mirror); + if (qemuDomainStorageSourceAccessAllow(driver, vm, mirror, false, = true) < 0) { + qemuDomainStorageSourceAccessRevoke(driver, vm, mirror); goto endjob; } } @@ -17774,7 +17774,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, ret =3D -1; if (ret < 0) { monitor_error =3D virSaveLastError(); - qemuDomainDiskChainElementRevoke(driver, vm, mirror); + qemuDomainStorageSourceAccessRevoke(driver, vm, mirror); goto endjob; } @@ -18149,9 +18149,9 @@ qemuDomainBlockCommit(virDomainPtr dom, * operation succeeds, but doing that requires tracking the * operation in XML across libvirtd restarts. */ clean_access =3D true; - if (qemuDomainDiskChainElementPrepare(driver, vm, baseSource, false, f= alse) < 0 || + if (qemuDomainStorageSourceAccessAllow(driver, vm, baseSource, false, = false) < 0 || (top_parent && top_parent !=3D disk->src && - qemuDomainDiskChainElementPrepare(driver, vm, top_parent, false, = false) < 0)) + qemuDomainStorageSourceAccessAllow(driver, vm, top_parent, false,= false) < 0)) goto endjob; if (!(job =3D qemuBlockJobDiskNew(disk, jobtype, device))) @@ -18192,9 +18192,9 @@ qemuDomainBlockCommit(virDomainPtr dom, if (ret < 0 && clean_access) { virErrorPtr orig_err =3D virSaveLastError(); /* Revert access to read-only, if possible. */ - qemuDomainDiskChainElementPrepare(driver, vm, baseSource, true, fa= lse); + qemuDomainStorageSourceAccessAllow(driver, vm, baseSource, true, f= alse); if (top_parent && top_parent !=3D disk->src) - qemuDomainDiskChainElementPrepare(driver, vm, top_parent, true= , false); + qemuDomainStorageSourceAccessAllow(driver, vm, top_parent, tru= e, false); if (orig_err) { virSetError(orig_err); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list