From nobody Sun Feb 8 18:44:47 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=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