From nobody Thu May 15 10:13:21 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510230064364221.64698636433252; Thu, 9 Nov 2017 04:21:04 -0800 (PST) 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 8CAF580C0A; Thu, 9 Nov 2017 12:21:02 +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 F3BD46F112; Thu, 9 Nov 2017 12:21:01 +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 424FE4BB79; Thu, 9 Nov 2017 12:20:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA9CKwmj026812 for ; Thu, 9 Nov 2017 07:20:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4C9586A83B; Thu, 9 Nov 2017 12:20:58 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id A114C69103; Thu, 9 Nov 2017 12:20:57 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 9 Nov 2017 13:20:32 +0100 Message-Id: <2f7c70e868007e07112d7a50ee3134059a1351f0.1510229931.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/4] qemu: domain: Don't allocate storage source private data if not needed 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: , MIME-Version: 1.0 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.26]); Thu, 09 Nov 2017 12:21:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- src/qemu/qemu_domain.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 61d28337b..db5af1019 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1402,13 +1402,18 @@ qemuDomainSecretStorageSourcePrepare(virConnectPtr = conn, const char *encalias) { qemuDomainStorageSourcePrivatePtr srcPriv; + bool hasAuth =3D qemuDomainSecretDiskCapable(src); + bool hasEnc =3D qemuDomainDiskHasEncryptionSecret(src); + + if (!hasAuth && !hasEnc) + return 0; if (!(src->privateData =3D qemuDomainStorageSourcePrivateNew())) return -1; srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - if (qemuDomainSecretDiskCapable(src)) { + if (hasAuth) { virSecretUsageType usageType =3D VIR_SECRET_USAGE_TYPE_ISCSI; if (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_RBD) @@ -1421,7 +1426,7 @@ qemuDomainSecretStorageSourcePrepare(virConnectPtr co= nn, return -1; } - if (qemuDomainDiskHasEncryptionSecret(src)) { + if (hasEnc) { if (!(srcPriv->encinfo =3D qemuDomainSecretInfoNew(conn, priv, encalias, VIR_SECRET_USAGE_TYPE_VOLUME, NULL, --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list