From nobody Mon Feb 9 09:28:58 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=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