From nobody Thu May 15 10:02:47 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 1527868303600886.8007384675146; Fri, 1 Jun 2018 08:51:43 -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 E338216D; Fri, 1 Jun 2018 15:51:41 +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 A69741779C; Fri, 1 Jun 2018 15:51:41 +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 283D01800FC1; Fri, 1 Jun 2018 15:51:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w51FpTdN010633 for ; Fri, 1 Jun 2018 11:51:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 894DD2026DFD; Fri, 1 Jun 2018 15:51:29 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E4AF2026DEF for ; Fri, 1 Jun 2018 15:51:29 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 17:51:09 +0200 Message-Id: <06578320c88fba19924015b12f4f5158a5f8a66d.1527868025.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/9] qemu: hotplug: Extract hotplug of TLS into qemuBlockStorageSourceAttachApply 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 01 Jun 2018 15:51:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_block.c | 9 +++++++++ src/qemu/qemu_block.h | 3 +++ src/qemu/qemu_command.c | 9 ++++++++- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_hotplug.c | 37 +------------------------------------ 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index b6b1316ea5..8053f08f6d 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1488,6 +1488,8 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorage= SourceAttachDataPtr data) virJSONValueFree(data->prmgrProps); virJSONValueFree(data->authsecretProps); virJSONValueFree(data->encryptsecretProps); + virJSONValueFree(data->tlsProps); + VIR_FREE(data->tlsAlias); VIR_FREE(data->authsecretAlias); VIR_FREE(data->encryptsecretAlias); VIR_FREE(data->driveCmd); @@ -1567,6 +1569,10 @@ qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon, &data->encryptsecretAlias) < 0) return -1; + if (data->tlsProps && + qemuMonitorAddObject(mon, &data->tlsProps, &data->tlsAlias) < 0) + return -1; + if (data->storageProps) { rv =3D qemuMonitorBlockdevAdd(mon, data->storageProps); data->storageProps =3D NULL; @@ -1637,6 +1643,9 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr m= on, if (data->encryptsecretAlias) ignore_value(qemuMonitorDelObject(mon, data->encryptsecretAlias)); + if (data->tlsAlias) + ignore_value(qemuMonitorDelObject(mon, data->tlsAlias)); + virErrorRestore(&orig_err); } diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 4ffb42dfd6..418b5064b5 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -91,6 +91,9 @@ struct qemuBlockStorageSourceAttachData { virJSONValuePtr encryptsecretProps; char *encryptsecretAlias; + + virJSONValuePtr tlsProps; + char *tlsAlias; }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e11ae8b874..87b043d3f3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10469,13 +10469,15 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomai= nDiskDefPtr disk, * qemuBuildStorageSourceAttachPrepareCommon: * @src: storage source * @data: already initialized data for disk source addition + * @qemuCaps: qemu capabilities object * * Prepare data for configuration associated with the disk source such as * secrets/TLS/pr objects etc ... */ int qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, - qemuBlockStorageSourceAttachData= Ptr data) + qemuBlockStorageSourceAttachData= Ptr data, + virQEMUCapsPtr qemuCaps) { qemuDomainStorageSourcePrivatePtr srcpriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); @@ -10495,5 +10497,10 @@ qemuBuildStorageSourceAttachPrepareCommon(virStora= geSourcePtr src, return -1; } + if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES && + qemuBuildTLSx509BackendProps(src->tlsCertdir, false, true, src->tl= sAlias, + NULL, qemuCaps, &data->tlsProps) < 0) + return -1; + return 0; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 711fce9648..0c2fdff807 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -108,7 +108,8 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskD= efPtr disk, virQEMUCapsPtr qemuCaps); int qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, - qemuBlockStorageSourceAttachData= Ptr data); + qemuBlockStorageSourceAttachData= Ptr data, + virQEMUCapsPtr qemuCaps); /* Current, best practice */ char *qemuBuildDriveDevStr(const virDomainDef *def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d4db3d2bba..d7c59b49c3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,35 +154,6 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver, } -static int -qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr src) -{ - int ret =3D -1; - qemuDomainObjPrivatePtr priv =3D vm->privateData; - virJSONValuePtr tlsProps =3D NULL; - - if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL, - src->tlsCertdir, - false, true, - src->tlsAlias, - &tlsProps, NULL) < 0) - goto cleanup; - - if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, - NULL, &tlsProps) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - virJSONValueFree(tlsProps); - - return ret; -} - - static int qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -413,11 +384,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (!(data =3D qemuBuildStorageSourceAttachPrepareDrive(disk, priv->qe= muCaps))) goto error; - if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data) < 0) - goto error; - - if (disk->src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES && - qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src) < 0) + if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data, priv->q= emuCaps) < 0) goto error; if (!(devstr =3D qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps= ))) @@ -463,8 +430,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virErrorPreserveLast(&orig_err); if (managedPrmgrAlias) ignore_value(qemuMonitorDelObject(priv->mon, managedPrmgrAlias)); - if (disk->src->tlsAlias) - ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias)); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -2; virErrorRestore(&orig_err); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list