From nobody Tue May 7 19:21:03 2024 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 From nobody Tue May 7 19:21:03 2024 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=1555598607; cv=none; d=zoho.com; s=zohoarc; b=GdcHNugp/WWpgoCfxtczrXJBOXS3XcFERPsDJdATWEeh5Y4ZOlIv6IpGFmCz78gAVf1QzDUDyOjTngf9aHbzuSNWconRKrPkriaDpv2QK4uuVM+2mY3fgdD+gjbgLficAMYMIBSuKUd7hwULfL/tOZFv5/0jZVum5WFlUQN8kZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598607; 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=bV7neGQsIp8/aEGeSzuVw9rnv1AFB7X967BO52YEyh4=; b=bCfKB4kJYRmn2gxyLZbWo05hxQXPiVeaJxHjmDp9/N4moYawfVah/EkOqeLkS6e8/sdTumFBX3TCRTtvN0A3GGlQt3SEWDXBgaUV44Yip3uZj9YamVcVe4lzfHaGfqQUt/4nJ5kpJzkJDKYA8I0ZpXlOOH/by32FoIBLcffFBH0= 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 1555598607414441.63468053826205; Thu, 18 Apr 2019 07:43:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D926F970E7; Thu, 18 Apr 2019 14:43:25 +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 AC6BA5C22B; Thu, 18 Apr 2019 14:43:25 +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 6CFCF181AC90; Thu, 18 Apr 2019 14:43:25 +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 x3IEhCb5020748 for ; Thu, 18 Apr 2019 10:43:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5ADA360BF7; Thu, 18 Apr 2019 14:43:12 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D70E660BEC for ; Thu, 18 Apr 2019 14:43:11 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:42:57 +0200 Message-Id: <474cd00693c543f3806b5abf3cde375bafbdcec0.1555598422.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 02/12] qemu: Move and rename qemuHotplugPrepareDiskSourceAccess 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 18 Apr 2019 14:43:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Move it to qemu_domain.c and call it qemuDomainStorageSourceChainAccessPrepare. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 68 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 5 +++ src/qemu/qemu_hotplug.c | 80 ++++------------------------------------- 3 files changed, 79 insertions(+), 74 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ce8f4a0dca..ab96688a65 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9211,6 +9211,74 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr di= sk, } +/** + * qemuDomainStorageSourceChainAccessPrepare: + * @driver: qemu driver struct + * @vm: domain object + * @src: Source to prepare + * @teardown: Teardown the access to @src instead of adding it to a vm + * + * Setup the locks, cgroups and security permissions on a disk source and = its + * backing chain. If @teardown is true, then the labels and cgroups are re= moved + * instead. + * + * Returns 0 on success and -1 on error. Reports libvirt error. + */ +int +qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src, + bool teardown) +{ + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + const char *srcstr =3D NULLSTR(src->path); + int ret =3D -1; + virErrorPtr orig_err =3D NULL; + + /* just tear down the disk access */ + if (teardown) { + virErrorPreserveLast(&orig_err); + ret =3D 0; + goto rollback_cgroup; + } + + if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, src) <= 0) + goto cleanup; + + if (qemuDomainNamespaceSetupDisk(vm, src) < 0) + goto rollback_lock; + + if (qemuSecuritySetImageLabel(driver, vm, src, true) < 0) + goto rollback_namespace; + + if (qemuSetupImageChainCgroup(vm, src) < 0) + goto rollback_label; + + ret =3D 0; + goto cleanup; + + rollback_cgroup: + if (qemuTeardownImageChainCgroup(vm, src) < 0) + VIR_WARN("Unable to tear down cgroup access on %s", srcstr); + rollback_label: + if (qemuSecurityRestoreImageLabel(driver, vm, src, true) < 0) + VIR_WARN("Unable to restore security label on %s", srcstr); + + rollback_namespace: + if (qemuDomainNamespaceTeardownDisk(vm, src) < 0) + VIR_WARN("Unable to remove /dev entry for %s", srcstr); + + rollback_lock: + if (virDomainLockImageDetach(driver->lockManager, vm, src) < 0) + VIR_WARN("Unable to release lock on %s", srcstr); + + cleanup: + virErrorRestore(&orig_err); + + return ret; +} + + /** * qemuDomainStorageSourceAccessRevoke: * diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9a48b5b69d..65b0e8c39d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -770,6 +770,11 @@ int qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr = disk, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; +int qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src, + bool teardown); + void qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr elem); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a4f7d111b1..dd5571aea3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -132,74 +132,6 @@ qemuDomainDeleteDevice(virDomainObjPtr vm, } -/** - * qemuHotplugPrepareDiskSourceAccess: - * @driver: qemu driver struct - * @vm: domain object - * @src: Source to prepare - * @teardown: Teardown the access to @src instead of adding it to a vm - * - * Setup the locks, cgroups and security permissions on a disk source and = its - * backing chain. If @teardown is true, then the labels and cgroups are re= moved - * instead. - * - * Returns 0 on success and -1 on error. Reports libvirt error. - */ -static int -qemuHotplugPrepareDiskSourceAccess(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr src, - bool teardown) -{ - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - const char *srcstr =3D NULLSTR(src->path); - int ret =3D -1; - virErrorPtr orig_err =3D NULL; - - /* just tear down the disk access */ - if (teardown) { - virErrorPreserveLast(&orig_err); - ret =3D 0; - goto rollback_cgroup; - } - - if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, src) <= 0) - goto cleanup; - - if (qemuDomainNamespaceSetupDisk(vm, src) < 0) - goto rollback_lock; - - if (qemuSecuritySetImageLabel(driver, vm, src, true) < 0) - goto rollback_namespace; - - if (qemuSetupImageChainCgroup(vm, src) < 0) - goto rollback_label; - - ret =3D 0; - goto cleanup; - - rollback_cgroup: - if (qemuTeardownImageChainCgroup(vm, src) < 0) - VIR_WARN("Unable to tear down cgroup access on %s", srcstr); - rollback_label: - if (qemuSecurityRestoreImageLabel(driver, vm, src, true) < 0) - VIR_WARN("Unable to restore security label on %s", srcstr); - - rollback_namespace: - if (qemuDomainNamespaceTeardownDisk(vm, src) < 0) - VIR_WARN("Unable to remove /dev entry for %s", srcstr); - - rollback_lock: - if (virDomainLockImageDetach(driver->lockManager, vm, src) < 0) - VIR_WARN("Unable to release lock on %s", srcstr); - - cleanup: - virErrorRestore(&orig_err); - - return ret; -} - - static int qemuDomainAttachZPCIDevice(qemuMonitorPtr mon, virDomainDeviceInfoPtr info) @@ -877,7 +809,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto cleanup; - if (qemuHotplugPrepareDiskSourceAccess(driver, vm, newsrc, false) < 0) + if (qemuDomainStorageSourceChainAccessPrepare(driver, vm, newsrc, fals= e) < 0) goto cleanup; if (qemuHotplugAttachManagedPR(driver, vm, newsrc, QEMU_ASYNC_JOB_NONE= ) < 0) @@ -896,7 +828,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, /* remove the old source from shared device list */ disk->src =3D oldsrc; ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)); - ignore_value(qemuHotplugPrepareDiskSourceAccess(driver, vm, oldsrc, tr= ue)); + ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm, old= src, true)); /* media was changed, so we can remove the old media definition now */ virObjectUnref(oldsrc); @@ -911,7 +843,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (sharedAdded) ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)= ); - ignore_value(qemuHotplugPrepareDiskSourceAccess(driver, vm, newsrc= , true)); + ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm,= newsrc, true)); } /* remove PR manager object if unneeded */ @@ -941,7 +873,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, char *devstr =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - if (qemuHotplugPrepareDiskSourceAccess(driver, vm, disk->src, false) <= 0) + if (qemuDomainStorageSourceChainAccessPrepare(driver, vm, disk->src, f= alse) < 0) goto cleanup; if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) @@ -1003,7 +935,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virDomainAuditDisk(vm, NULL, disk->src, "attach", false); error: - ignore_value(qemuHotplugPrepareDiskSourceAccess(driver, vm, disk->src,= true)); + ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm, dis= k->src, true)); goto cleanup; } @@ -4532,7 +4464,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &disk->info); /* tear down disk security access */ - qemuHotplugPrepareDiskSourceAccess(driver, vm, disk->src, true); + qemuDomainStorageSourceChainAccessPrepare(driver, vm, disk->src, true); dev.type =3D VIR_DOMAIN_DEVICE_DISK; dev.data.disk =3D disk; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598599; cv=none; d=zoho.com; s=zohoarc; b=TV6O97uBwztnPwFICH/TeVnTOI7nY+zJqTxr/VKW9IGXP+jNTC1/krH9+ViNs3S/oW5WVxTQB83P/4q55dHB8kGcvHCpKhxcLliy8KHIVr4CNIvS3XbCXvWyAhb5l6BvdHnmi2c50UlvAloFDrZg80w9Nws924V0/vzKRuK8x/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598599; 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=LAtiOgLbKiE5SzylPFD7ruwsdfKx3Rs/yjQukIoBulA=; b=K4FCHGnpt8qBQDks9OrcnvXcW/bkdsZflRTEzcZriIqhypHS8nXLfrPqRJj2YT34CMf4E0GnZ0aqeg9QOyH9imm4/2wCAGKXety60Bgm6XPB1BcQAXGd0Ua6k/jRA4siXk+cqQV0a+xgAq5oSmU1XG3R6VCtjXzDdJly6ajSmkA= 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 1555598599002203.94697776336318; Thu, 18 Apr 2019 07:43:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCCB23001C72; Thu, 18 Apr 2019 14:43:16 +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 98F3C60BEC; Thu, 18 Apr 2019 14:43:16 +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 3858F3FAF5; Thu, 18 Apr 2019 14:43:16 +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 x3IEhDfW020755 for ; Thu, 18 Apr 2019 10:43:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2AB6160BEC; Thu, 18 Apr 2019 14:43:13 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A737360BFC for ; Thu, 18 Apr 2019 14:43:12 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:42:58 +0200 Message-Id: <14b81ec9c2cfec7796921e4b08e040d55a4bbac4.1555598422.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 03/12] qemu: Split entry points to qemuDomainStorageSourceChainAccessPrepare 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 18 Apr 2019 14:43:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Introduce qemuDomainStorageSourceChainAccess(Allow|Revoke) as entry points to qemuDomainStorageSourceChainAccessPrepare for symmetry with the functions for single backing chain elements. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 20 +++++++++++++++++++- src/qemu/qemu_domain.h | 10 ++++++---- src/qemu/qemu_hotplug.c | 12 ++++++------ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab96688a65..85e43027d5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9224,7 +9224,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr dis= k, * * Returns 0 on success and -1 on error. Reports libvirt error. */ -int +static int qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr src, @@ -9279,6 +9279,24 @@ qemuDomainStorageSourceChainAccessPrepare(virQEMUDri= verPtr driver, } +int +qemuDomainStorageSourceChainAccessAllow(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, fals= e); +} + + +int +qemuDomainStorageSourceChainAccessRevoke(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, true= ); +} + + /** * qemuDomainStorageSourceAccessRevoke: * diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 65b0e8c39d..f92f0dbc27 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -770,10 +770,12 @@ int qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr= disk, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr src, - bool teardown); +int qemuDomainStorageSourceChainAccessAllow(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); +int qemuDomainStorageSourceChainAccessRevoke(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); void qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index dd5571aea3..ce5ca015ab 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -809,7 +809,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto cleanup; - if (qemuDomainStorageSourceChainAccessPrepare(driver, vm, newsrc, fals= e) < 0) + if (qemuDomainStorageSourceChainAccessAllow(driver, vm, newsrc) < 0) goto cleanup; if (qemuHotplugAttachManagedPR(driver, vm, newsrc, QEMU_ASYNC_JOB_NONE= ) < 0) @@ -828,7 +828,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, /* remove the old source from shared device list */ disk->src =3D oldsrc; ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)); - ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm, old= src, true)); + ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, olds= rc)); /* media was changed, so we can remove the old media definition now */ virObjectUnref(oldsrc); @@ -843,7 +843,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (sharedAdded) ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)= ); - ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm,= newsrc, true)); + ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, = newsrc)); } /* remove PR manager object if unneeded */ @@ -873,7 +873,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, char *devstr =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - if (qemuDomainStorageSourceChainAccessPrepare(driver, vm, disk->src, f= alse) < 0) + if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0) goto cleanup; if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) @@ -935,7 +935,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virDomainAuditDisk(vm, NULL, disk->src, "attach", false); error: - ignore_value(qemuDomainStorageSourceChainAccessPrepare(driver, vm, dis= k->src, true)); + ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, disk= ->src)); goto cleanup; } @@ -4464,7 +4464,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &disk->info); /* tear down disk security access */ - qemuDomainStorageSourceChainAccessPrepare(driver, vm, disk->src, true); + qemuDomainStorageSourceChainAccessRevoke(driver, vm, disk->src); dev.type =3D VIR_DOMAIN_DEVICE_DISK; dev.data.disk =3D disk; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=lrOhChCfPIByJK9wLqIRWalgGVrXzFb4CYe71l0NpgiI59w4BRIv17plQcVfzRExYO0rTUynZDDJ5X5BbzWVhO5tQFTgjGLr0o4RmWEg+vhpR5fvMZY/Z95ig0h4ZR11k7QNLD5RWVbAbTLmvZAFk0BTFWrW57rqQKcgUZwXCNo= 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=NVyhmh2j/ScLqtnkFKcUDemKkwS6momk2VMiLUFJ2aQ=; b=JYqBPRtKzICxQ55AThKYSfmWk2LIls5mgW/p7C7AWvnlNLFsS+wlHTNPbNeBjBc+i/fOSXEc9Emx280OIkSnANcKdDqhG+HtPg+D3NQLr35NTcDg9WhnsXURC0kmGZ59Pi5cHFqIvHyR1aFxfum/QEFY9Fy1bqiLyfTIa/QHHX4= 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 1555598603969223.76172283896426; Thu, 18 Apr 2019 07:43:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58ED9BDD1; 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 306B35C224; 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 EB36F3FA49; 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 x3IEhDjS020763 for ; Thu, 18 Apr 2019 10:43:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id EEC6760BFC; Thu, 18 Apr 2019 14:43:13 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76FFC60BF7 for ; Thu, 18 Apr 2019 14:43:13 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:42:59 +0200 Message-Id: <831dcdf35df671a36edecd44b996cc62f707f3fc.1555598422.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 04/12] qemu: domain: Rename qemuDomainStorageSourceChainAccessPrepare 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 18 Apr 2019 14:43:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function will be able to deal with non-chains too so drop 'Chain' and also change the suffix to 'Modify' as it's used both for setup and teardown. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 85e43027d5..b4c59b9a74 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9212,7 +9212,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr dis= k, /** - * qemuDomainStorageSourceChainAccessPrepare: + * qemuDomainStorageSourceAccessModify: * @driver: qemu driver struct * @vm: domain object * @src: Source to prepare @@ -9225,10 +9225,10 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr d= isk, * Returns 0 on success and -1 on error. Reports libvirt error. */ static int -qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr src, - bool teardown) +qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src, + bool teardown) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); const char *srcstr =3D NULLSTR(src->path); @@ -9284,7 +9284,7 @@ qemuDomainStorageSourceChainAccessAllow(virQEMUDriver= Ptr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, fals= e); + return qemuDomainStorageSourceAccessModify(driver, vm, src, false); } @@ -9293,7 +9293,7 @@ qemuDomainStorageSourceChainAccessRevoke(virQEMUDrive= rPtr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, true= ); + return qemuDomainStorageSourceAccessModify(driver, vm, src, true); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=mL9xAxJDhDIZsUZ6gaGOePlq51B9s9Ioh1lb7sU563265i6iNIZTuXdHtgxJN+rIB36dLVbpoAEhd+VfT4q/OdW3VbN42zdDpC32D/Vt7MZ9cgApwiXJ4UYn7YaCiTASqz7n3Xvw6c39p6RWPkQi/6sCT8GDwuhFxsjn/rBGlik= 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=94RVNYlFjCVxgV6+gamuzdJZSQzb+e8qigQNdPFHiRA=; b=QsH3BHaLwf/E6zFSjnv81UIyj66LFaG3Fr6zZjxHe4wuRUAu7DqVXzmcftKCbRoppXw1WWyynBGQutmILkLzePXf5Q96WGOVkuyAD8uzUVsEoTeu4dqoropkVXaYQphXNNskrlWxGMMO1nqxwJ/S234KTmt4fZK5ZjKm874hWz0= 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 1555598614293576.8392710129307; Thu, 18 Apr 2019 07:43:34 -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 828E43B735; 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 5754519C7B; 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 1FF81181B9EE; 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 x3IEhEAK020773 for ; Thu, 18 Apr 2019 10:43:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1FD460BFC; Thu, 18 Apr 2019 14:43:14 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4839D60BF7 for ; Thu, 18 Apr 2019 14:43:14 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:00 +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 05/12] qemu: Convert boolean flags to enum flags in qemuDomainStorageSourceAccessModify 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.30]); Thu, 18 Apr 2019 14:43:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Upcoming patches will add a few more flags. Add an enum to collect them so that we don't end up with multiple bools. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b4c59b9a74..6644c1418b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9211,16 +9211,21 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr d= isk, } +typedef enum { + /* revoke access to the image instead of allowing it */ + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE =3D 1 << 0, +} qemuDomainStorageSourceAccessFlags; + + /** * qemuDomainStorageSourceAccessModify: * @driver: qemu driver struct * @vm: domain object * @src: Source to prepare - * @teardown: Teardown the access to @src instead of adding it to a vm + * @flags: bitwise or of qemuDomainStorageSourceAccessFlags * * Setup the locks, cgroups and security permissions on a disk source and = its - * backing chain. If @teardown is true, then the labels and cgroups are re= moved - * instead. + * backing chain. * * Returns 0 on success and -1 on error. Reports libvirt error. */ @@ -9228,7 +9233,7 @@ static int qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr src, - bool teardown) + qemuDomainStorageSourceAccessFlags fla= gs) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); const char *srcstr =3D NULLSTR(src->path); @@ -9236,7 +9241,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr = driver, virErrorPtr orig_err =3D NULL; /* just tear down the disk access */ - if (teardown) { + if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { virErrorPreserveLast(&orig_err); ret =3D 0; goto rollback_cgroup; @@ -9284,7 +9289,9 @@ qemuDomainStorageSourceChainAccessAllow(virQEMUDriver= Ptr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - return qemuDomainStorageSourceAccessModify(driver, vm, src, false); + qemuDomainStorageSourceAccessFlags flags =3D 0; + + return qemuDomainStorageSourceAccessModify(driver, vm, src, flags); } @@ -9293,7 +9300,9 @@ qemuDomainStorageSourceChainAccessRevoke(virQEMUDrive= rPtr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - return qemuDomainStorageSourceAccessModify(driver, vm, src, true); + qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_REVOKE; + + return qemuDomainStorageSourceAccessModify(driver, vm, src, flags); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598601; cv=none; d=zoho.com; s=zohoarc; b=kCPI1JTkXgi0TTaeWPCINvN9cOYhdfEblbXaGKMfUksttjqNe5qYfwUa6tiYTg3p8VFisoOHzRpURpzkrW0eZeoySPrd/pdIn3lpfvGs9BRqb9lSE2yWdvTGB56exkKjHWOPhA9YI9eOXqAsxV9cqV2sHva8bQrCJz/QuRbzkjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598601; 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=ktGLVDoCOT3DXeptcODv9sHVrTQ3uOxKir2Jv71KA+M=; b=DymwRzou6Af7Y/oFeI2Gwwbu7hZhEeEtMjZSgNRirje3gU87CSxmBu1Wo1BOVoAOgFN/V6M6rMP5rPgosEvvJCiILzAK7KKQ7l3UUAWaL/jSZZm9gkYeKSgYOR3SM8QmnnS2X5UuBY6nsQLdfGF+BlicPqU8Cuv6nNilEuLMjrQ= 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 1555598601159411.87578269889434; Thu, 18 Apr 2019 07:43:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 76818307E061; Thu, 18 Apr 2019 14:43:19 +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 4EBE15C207; Thu, 18 Apr 2019 14:43:19 +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 0C5A63FAF7; Thu, 18 Apr 2019 14:43:19 +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 x3IEhFP3020780 for ; Thu, 18 Apr 2019 10:43:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 91EFA60BF7; Thu, 18 Apr 2019 14:43:15 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A58860BEC for ; Thu, 18 Apr 2019 14:43:14 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:01 +0200 Message-Id: <8619844bd794a08a0ccb87a2f30c2efde64b5adc.1555598422.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 06/12] qemu: Allow using qemuDomainStorageSourceAccessModify on singe images 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 18 Apr 2019 14:43:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Add a new flag QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN to select whether to work on single image or full chain. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6644c1418b..30acba3c47 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9214,6 +9214,8 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr dis= k, typedef enum { /* revoke access to the image instead of allowing it */ 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, } qemuDomainStorageSourceAccessFlags; @@ -9239,6 +9241,8 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr = driver, const char *srcstr =3D NULLSTR(src->path); int ret =3D -1; virErrorPtr orig_err =3D NULL; + bool chain =3D flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN; + int rc; /* just tear down the disk access */ if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { @@ -9253,20 +9257,30 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPt= r driver, if (qemuDomainNamespaceSetupDisk(vm, src) < 0) goto rollback_lock; - if (qemuSecuritySetImageLabel(driver, vm, src, true) < 0) + if (qemuSecuritySetImageLabel(driver, vm, src, chain) < 0) goto rollback_namespace; - if (qemuSetupImageChainCgroup(vm, src) < 0) + if (chain) + rc =3D qemuSetupImageChainCgroup(vm, src); + else + rc =3D qemuSetupImageCgroup(vm, src); + + if (rc < 0) goto rollback_label; ret =3D 0; goto cleanup; rollback_cgroup: - if (qemuTeardownImageChainCgroup(vm, src) < 0) + if (chain) + rc =3D qemuTeardownImageChainCgroup(vm, src); + else + rc =3D qemuTeardownImageCgroup(vm, src); + + if (rc < 0) VIR_WARN("Unable to tear down cgroup access on %s", srcstr); rollback_label: - if (qemuSecurityRestoreImageLabel(driver, vm, src, true) < 0) + if (qemuSecurityRestoreImageLabel(driver, vm, src, chain) < 0) VIR_WARN("Unable to restore security label on %s", srcstr); rollback_namespace: @@ -9289,7 +9303,7 @@ qemuDomainStorageSourceChainAccessAllow(virQEMUDriver= Ptr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - qemuDomainStorageSourceAccessFlags flags =3D 0; + qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_CHAIN; return qemuDomainStorageSourceAccessModify(driver, vm, src, flags); } @@ -9300,7 +9314,8 @@ qemuDomainStorageSourceChainAccessRevoke(virQEMUDrive= rPtr driver, virDomainObjPtr vm, virStorageSourcePtr src) { - qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_REVOKE; + qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_REVOKE | + QEMU_DOMAIN_STORAGE_SOURCE_= ACCESS_CHAIN; return qemuDomainStorageSourceAccessModify(driver, vm, src, flags); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598604; cv=none; d=zoho.com; s=zohoarc; b=hsIHHJLcFbhz0qseFfj7mofyT3NPqtKezVQfbTqE+/Vztue3IAY7lgB+Km5W0xcVzAPot+ihxCqTM4XCaiesxyRKxK3gYF1qkS4fz+odiwiV9YGoQvNcjZPsWQc80Yf9Gpg9kl5EGkT4ctoXkHvPW8wLGt5YW7/AXbuKVZs8oXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598604; 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=XyI/jSC1gsROYeSkQO7rSl5BPesJleOrPcN5tyKVe54=; b=KeYk1zS3H2DKKdnduSABWeGcua4MAtMTvbhz716L6zY/Y/XiWBuWXxv7scEi47BAkmF7YCza8v5hGQml9ud/DgA7NIlULpRQWbondP/3iiixqC5YP3ertMAbC+v4tViVS6qyZ34i4toKZu9FMpUyHYMjBEg3tkb+PYYBNK46Jg8= 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 1555598604887771.3866644866218; Thu, 18 Apr 2019 07:43:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C17B88AB1; Thu, 18 Apr 2019 14:43:23 +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 1898A600C5; Thu, 18 Apr 2019 14:43:23 +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 B0C71181AC8E; Thu, 18 Apr 2019 14:43:22 +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 x3IEhGsA020788 for ; Thu, 18 Apr 2019 10:43:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 61E6E60BFC; Thu, 18 Apr 2019 14:43:16 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE78E60BEC for ; Thu, 18 Apr 2019 14:43:15 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:02 +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 07/12] qemu: Refactor/simplify qemuDomainStorageSourceAccessRevoke 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 18 Apr 2019 14:43:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use qemuDomainStorageSourceAccessModify instead of the individual calls. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 30acba3c47..f7d1250f09 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9332,18 +9332,9 @@ qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr= driver, virDomainObjPtr vm, virStorageSourcePtr elem) { - if (qemuTeardownImageCgroup(vm, elem) < 0) - VIR_WARN("Failed to teardown cgroup for disk path %s", - NULLSTR(elem->path)); + qemuDomainStorageSourceAccessFlags flags =3D QEMU_DOMAIN_STORAGE_SOURC= E_ACCESS_REVOKE; - if (qemuSecurityRestoreImageLabel(driver, vm, elem, false) < 0) - VIR_WARN("Unable to restore security label on %s", NULLSTR(elem->p= ath)); - - if (qemuDomainNamespaceTeardownDisk(vm, elem) < 0) - VIR_WARN("Unable to remove /dev entry for %s", NULLSTR(elem->path)= ); - - if (virDomainLockImageDetach(driver->lockManager, vm, elem) < 0) - VIR_WARN("Unable to release lock on %s", NULLSTR(elem->path)); + ignore_value(qemuDomainStorageSourceAccessModify(driver, vm, elem, fla= gs)); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598609; cv=none; d=zoho.com; s=zohoarc; b=lDW91ENX2wvWtbFm/AvYX7CgK3SUx6fN2NwrLq/HC2utJgg4rrHDSyHnNL5701kD+Avks3i4qX5fLWEVSB8t8CWQdvdY+khUvyN4K46Df+9ZZA2B7frtKA2DOA+XF/G9E6YcTrrzjRYr5m02Ye4f0pIhs6rtRHfMgRCtMcFsd4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598609; 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=KjscP8f1HUL/I30mWp/9lrTy3Q4ceUlGb9AtSiFaNfU=; b=KoN97REMiifrLO9MlVTzbuCgco78DMVFLsToE1QyOd2yvc861herB9h85i+6NW4+Uz8+Pr8E3s2njE4I1WV9nzZlh2VUa+lIE9nDcnEbgUxJI9nVEu8NRJi22CLab2QvK7kyro1deyfRiWu68HbHNb2o6ys4tQXcFmJ1c7EzXd0= 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 1555598609125642.7120060171891; Thu, 18 Apr 2019 07:43:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B2173002F52; Thu, 18 Apr 2019 14:43:27 +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 D1E5360150; Thu, 18 Apr 2019 14:43:26 +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 879EA181B9ED; Thu, 18 Apr 2019 14:43:26 +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 x3IEhHoe020798 for ; Thu, 18 Apr 2019 10:43:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3225E60C66; Thu, 18 Apr 2019 14:43:17 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEB3D60BF7 for ; Thu, 18 Apr 2019 14:43:16 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:03 +0200 Message-Id: <6d66ce750568afc22846861b678596779579cf8b.1555598422.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 08/12] qemu: Allow forcing read-only mode in qemuDomainStorageSourceAccessModify 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 18 Apr 2019 14:43:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Add a new flag which will set the image as read-only even if the image data allows writing. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f7d1250f09..e8f6ee548a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9216,6 +9216,8 @@ 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, } qemuDomainStorageSourceAccessFlags; @@ -9243,6 +9245,10 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr= driver, virErrorPtr orig_err =3D NULL; bool chain =3D flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN; int rc; + bool was_readonly =3D src->readonly; + + if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY) + src->readonly =3D true; /* just tear down the disk access */ if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { @@ -9292,6 +9298,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr = driver, VIR_WARN("Unable to release lock on %s", srcstr); cleanup: + src->readonly =3D was_readonly; virErrorRestore(&orig_err); return ret; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598607; cv=none; d=zoho.com; s=zohoarc; b=ZuNOxXRsYfCFfuon1haizOQdPqjx+6bOctZvrJ1Gqn/LJorJzJJcZyIDk0w8V/Cp6lObz4uZDu78XMIOXHPwq1NMl/Rm3icdfXoT5DGcP9O1oDsf/4i/+AXIL105XCaqV0jTAynd2TQLMbUZg05U/ZyOu4bgTTai8x+K1HbLT/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598607; 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=pDrzbVvqY9VkGZPRF29ibChxie5vFQELtND6n8NivZY=; b=Ho8rJ/Ib3m7mEBV67UQ9a5NLXjUo2uPNr0uKT3eLQW7Ql3dIoN2s8nEnothQJOXAt61n1XOaHgO+4Kcb4JAsGa06AKOus+RirUN7ivlFHTZE/2DcHBAN2lj4iitHnyUPhD72TrggTXflvLGsImHKyJ5eb4eiGwg5oiFtLb9N2UY= 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 1555598607941882.9072904792863; Thu, 18 Apr 2019 07:43:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6D3A88ABE; Thu, 18 Apr 2019 14:43:25 +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 C3AC85C21F; Thu, 18 Apr 2019 14:43:25 +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 821FE181AC8F; Thu, 18 Apr 2019 14:43:25 +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 x3IEhI1C020809 for ; Thu, 18 Apr 2019 10:43:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 01EB760BF7; Thu, 18 Apr 2019 14:43:18 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F08B60BEC for ; Thu, 18 Apr 2019 14:43:17 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:04 +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 09/12] qemu: Use bools rather than labels in qemuDomainStorageSourceAccessModify 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 18 Apr 2019 14:43:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Rather than jumping to the correct label use a set of booleans to determine which operation needs to be rolled back. This will allow more flexibility when e.g. rollback after a failed operation will not be necessary/desired. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 68 ++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8f6ee548a..aec094d8f9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9246,6 +9246,10 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr= driver, bool chain =3D flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN; int rc; bool was_readonly =3D src->readonly; + bool revoke_cgroup =3D false; + bool revoke_label =3D false; + bool revoke_namespace =3D false; + bool revoke_lockspace =3D false; if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY) src->readonly =3D true; @@ -9253,18 +9257,28 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPt= r driver, /* just tear down the disk access */ if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { virErrorPreserveLast(&orig_err); + revoke_cgroup =3D true; + revoke_label =3D true; + revoke_namespace =3D true; + revoke_lockspace =3D true; ret =3D 0; - goto rollback_cgroup; + goto revoke; } if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, src) <= 0) - goto cleanup; + goto revoke; + + revoke_lockspace =3D true; if (qemuDomainNamespaceSetupDisk(vm, src) < 0) - goto rollback_lock; + goto revoke; + + revoke_namespace =3D true; if (qemuSecuritySetImageLabel(driver, vm, src, chain) < 0) - goto rollback_namespace; + goto revoke; + + revoke_label =3D true; if (chain) rc =3D qemuSetupImageChainCgroup(vm, src); @@ -9272,30 +9286,38 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPt= r driver, rc =3D qemuSetupImageCgroup(vm, src); if (rc < 0) - goto rollback_label; + goto revoke; + + revoke_cgroup =3D true; ret =3D 0; goto cleanup; - rollback_cgroup: - if (chain) - rc =3D qemuTeardownImageChainCgroup(vm, src); - else - rc =3D qemuTeardownImageCgroup(vm, src); + revoke: + if (revoke_cgroup) { + if (chain) + rc =3D qemuTeardownImageChainCgroup(vm, src); + else + rc =3D qemuTeardownImageCgroup(vm, src); - if (rc < 0) - VIR_WARN("Unable to tear down cgroup access on %s", srcstr); - rollback_label: - if (qemuSecurityRestoreImageLabel(driver, vm, src, chain) < 0) - VIR_WARN("Unable to restore security label on %s", srcstr); - - rollback_namespace: - if (qemuDomainNamespaceTeardownDisk(vm, src) < 0) - VIR_WARN("Unable to remove /dev entry for %s", srcstr); - - rollback_lock: - if (virDomainLockImageDetach(driver->lockManager, vm, src) < 0) - VIR_WARN("Unable to release lock on %s", srcstr); + if (rc < 0) + VIR_WARN("Unable to tear down cgroup access on %s", srcstr); + } + + if (revoke_label) { + if (qemuSecurityRestoreImageLabel(driver, vm, src, chain) < 0) + VIR_WARN("Unable to restore security label on %s", srcstr); + } + + if (revoke_namespace) { + if (qemuDomainNamespaceTeardownDisk(vm, src) < 0) + VIR_WARN("Unable to remove /dev entry for %s", srcstr); + } + + if (revoke_lockspace) { + if (virDomainLockImageDetach(driver->lockManager, vm, src) < 0) + VIR_WARN("Unable to release lock on %s", srcstr); + } cleanup: src->readonly =3D was_readonly; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598611; cv=none; d=zoho.com; s=zohoarc; b=A4zKEXG9SrOjTehp/QTt3VQ2ndWXlGLkTtzEvUHeyH7n+KezPrYhALZBw+rcKXFjEEOSWa2VpZ74dbGvWPU44V7Gj2/2ZQV1rNmcNi012rluc97T891cM4O/1j0tWOYJfAwK+hEgVQps3UmbFj4QAt7ppqyp6hNzwq5XQhJ+mLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598611; 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=IHKeEpCZl8NNjkbgkEMX0kNKH315D3PjzwpG/5zfUyk=; b=g4pIjeghTzHu7p3r199j14Btfj5y0wJ+XY/Jk+XTbzlTux4IkUfNhCanyWKDLs0ihaeVBEDxrwLPORrLyuw9kQDRhkX1Y/vOv/WU6G3lZe/DZJUW9+fMgltF3pDK6imTiae34Fafg3JrdMinsGWJUE8aQsVaHQp6zVHeHTHZ028= 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 1555598611294265.3008536818611; Thu, 18 Apr 2019 07:43:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 819D130A7C89; Thu, 18 Apr 2019 14:43:29 +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 583A75DA34; Thu, 18 Apr 2019 14:43:29 +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 101143FA4D; Thu, 18 Apr 2019 14:43:29 +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 x3IEhI0t020816 for ; Thu, 18 Apr 2019 10:43:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id C53C360BF7; Thu, 18 Apr 2019 14:43:18 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EADF60BEC for ; Thu, 18 Apr 2019 14:43:18 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:05 +0200 Message-Id: <4861aee61665d2cfd5a3de7c7f781afd8cebbf3a.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 10/12] qemu: Allow skipping the revoke step in qemuDomainStorageSourceAccessModify 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 18 Apr 2019 14:43:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In some cases when we need to modify access permissions for a storage source which is already used by the VM we should not revoke all permissions on a failure. Allow this in qemuDomainStorageSourceAccessModify by adding a new flag. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index aec094d8f9..82ebf3c324 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9218,6 +9218,8 @@ typedef enum { 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, + /* don't revoke permissions when modification has failed */ + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE =3D 1 << 3, } qemuDomainStorageSourceAccessFlags; @@ -9294,6 +9296,9 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr = driver, goto cleanup; revoke: + if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE) + goto cleanup; + if (revoke_cgroup) { if (chain) rc =3D qemuTeardownImageChainCgroup(vm, src); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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=1555598617; cv=none; d=zoho.com; s=zohoarc; b=KDUtg4j8D92y4dPVZn7yjFcpBRxTUVTJ43yba+0UyRVXYBmNaYgDVNhoU9j7vVTi9KCzuLdoPKIUqTrZ6aW19TuPcne8w0FvGMIgYzoxfhL4UPW9j1rPNhWMnRDB0pVhnkiyKp0gA2FHn2fHJOfKeYR6kJ1XsfytObAY6Z/fls0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555598617; 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=NeaSfdiZXyd9q4m2URbHigJiln3GJjDfaJ3UrYu/f+A=; b=jiJB7SEcM5ccv4+PqCBIVX/m3pTWrlquxuL7dmn0o8NAQDjql/rtsndOTLzPszImY8wDYTow96YPuMxPPFVYaNlabyd7N6VcLBA38Y97A433hcMXRnuxgBXbOhTbKKKr+qsmTuP+4rrkZGSgzLylGWfP2UH6wBUng7MzDuLBL0o= 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 1555598617868801.5240183698081; Thu, 18 Apr 2019 07:43:37 -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 07ED03078DA4; Thu, 18 Apr 2019 14:43:36 +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 D261419C7F; Thu, 18 Apr 2019 14:43:35 +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 968813FA51; Thu, 18 Apr 2019 14:43:35 +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 x3IEhJAU020822 for ; Thu, 18 Apr 2019 10:43:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 96D1360BFC; Thu, 18 Apr 2019 14:43:19 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EA2960BF7 for ; Thu, 18 Apr 2019 14:43:18 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 18 Apr 2019 16:43:06 +0200 Message-Id: <67941938dcb26e5e0d1d87ec5575bdd2a6f7341f.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 11/12] qemu: Mark when modifying access to existing source in qemuDomainStorageSourceAccessModify 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.43]); Thu, 18 Apr 2019 14:43:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Some operations e.g. namespace setup are not necessary when modifying access to a file which the VM can already access. Add a flag which allows to skip them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 82ebf3c324..75d0b34e42 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9220,6 +9220,8 @@ typedef enum { QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_READ_ONLY =3D 1 << 2, /* don't revoke permissions when modification has failed */ QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE =3D 1 << 3, + /* VM already has access to the source and we are just modifying it */ + QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS =3D 1 << 4, } qemuDomainStorageSourceAccessFlags; @@ -9272,10 +9274,13 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPt= r driver, revoke_lockspace =3D true; - if (qemuDomainNamespaceSetupDisk(vm, src) < 0) - goto revoke; + /* When modifying access of existing @src namespace does not need upda= te */ + if (!(flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS)) { + if (qemuDomainNamespaceSetupDisk(vm, src) < 0) + goto revoke; - revoke_namespace =3D true; + revoke_namespace =3D true; + } if (qemuSecuritySetImageLabel(driver, vm, src, chain) < 0) goto revoke; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 19:21:03 2024 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