From nobody Thu May 15 10:12:05 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527684173037757.4404894377699; Wed, 30 May 2018 05:42:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71E6D38DC96; Wed, 30 May 2018 12:42:50 +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 034AB308BDA2; Wed, 30 May 2018 12:42:50 +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 7A55518033F2; Wed, 30 May 2018 12:42:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4UCg0YX027588 for ; Wed, 30 May 2018 08:42:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBBBF217B40B; Wed, 30 May 2018 12:42:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 705FB217B409 for ; Wed, 30 May 2018 12:42:00 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 30 May 2018 14:41:17 +0200 Message-Id: <52bd9f05d54694ea449ef8a12db46cbc11c7cd79.1527683836.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 21/38] qemu: domain: Separate setup of TLS for VXHS disks from qemuDomainPrepareDiskSourceTLS 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 30 May 2018 12:42:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Split out the code into a separate function so that all steps for a storage protocol are contained and the original function is easily extendable. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 51 ++++++++++++++++++++++++++++------------------= ---- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 15c2e28604..a4499e7916 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9911,6 +9911,32 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def, } +static int +qemuProcessPrepareStorageSourceTlsVxhs(virStorageSourcePtr src, + virQEMUDriverConfigPtr cfg) +{ + /* VxHS uses only client certificates and thus has no need for + * the server-key.pem nor a secret that could be used to decrypt + * the it, so no need to add a secinfo for a secret UUID. */ + if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_ABSENT) { + if (cfg->vxhsTLS) + src->haveTLS =3D VIR_TRISTATE_BOOL_YES; + else + src->haveTLS =3D VIR_TRISTATE_BOOL_NO; + src->tlsFromConfig =3D true; + } + + if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { + if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) + return -1; + + src->tlsVerify =3D true; + } + + return 0; +} + + /* qemuProcessPrepareDiskSourceTLS: * @source: pointer to host interface data for disk device * @cfg: driver configuration @@ -9928,29 +9954,10 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr = src, virStorageSourcePtr next; for (next =3D src; virStorageSourceIsBacking(next); next =3D next->bac= kingStore) { - /* VxHS uses only client certificates and thus has no need for - * the server-key.pem nor a secret that could be used to decrypt - * the it, so no need to add a secinfo for a secret UUID. */ if (next->type =3D=3D VIR_STORAGE_TYPE_NETWORK && - next->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_VXHS) { - - if (next->haveTLS =3D=3D VIR_TRISTATE_BOOL_ABSENT) { - if (cfg->vxhsTLS) - next->haveTLS =3D VIR_TRISTATE_BOOL_YES; - else - next->haveTLS =3D VIR_TRISTATE_BOOL_NO; - next->tlsFromConfig =3D true; - } - - if (next->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { - /* Grab the vxhsTLSx509certdir and set the verify/listen v= alues. - * NB: tlsAlias filled in during qemuDomainGetTLSObjects. = */ - if (VIR_STRDUP(next->tlsCertdir, cfg->vxhsTLSx509certdir) = < 0) - return -1; - - next->tlsVerify =3D true; - } - } + next->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_VXHS && + qemuProcessPrepareStorageSourceTlsVxhs(next, cfg) < 0) + return -1; } return 0; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list