From nobody Thu May 15 10:01:41 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 1527700061191260.46537553444637; Wed, 30 May 2018 10:07:41 -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 6C4B830A74F4; Wed, 30 May 2018 17:07:39 +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 0B080308BDA1; Wed, 30 May 2018 17:07:39 +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 80DFC180BA83; Wed, 30 May 2018 17:07:38 +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 w4UH6uhm007341 for ; Wed, 30 May 2018 13:06:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C3222026DEF; Wed, 30 May 2018 17:06:56 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30D252026DFD for ; Wed, 30 May 2018 17:06:56 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 30 May 2018 19:06:34 +0200 Message-Id: <54aeb1dcebb87da498afb5211839c7c5d7d66fda.1527699462.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 10/13] qemu: hotplug: Refactor tls-credential props formatting to qemuMonitorCreateObjectProps 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.42]); Wed, 30 May 2018 17:07:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Note that it's okay to pass NULL to qemuDomainDelTLSObjects in qemuDomainAddTLSObjects as the tls-creds-x509 object was either not created or qemu crashed. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 29 +++++++++++++++-------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 25 +++++++++++-------------- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_migration_params.c | 4 ++-- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f604a9e8aa..00ca557025 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -684,6 +684,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, * @tlspath: path to the TLS credentials * @listen: boolen listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) + * @alias: alias for the TLS credentials object * @secalias: if one exists, the alias of the security object for password= id * @qemuCaps: capabilities * @propsret: json properties to return @@ -696,6 +697,7 @@ int qemuBuildTLSx509BackendProps(const char *tlspath, bool isListen, bool verifypeer, + const char *alias, const char *secalias, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret) @@ -706,12 +708,12 @@ qemuBuildTLSx509BackendProps(const char *tlspath, return -1; } - if (virJSONValueObjectCreate(propsret, - "s:dir", tlspath, - "s:endpoint", (isListen ? "server": "clie= nt"), - "b:verify-peer", (isListen ? verifypeer := true), - "S:passwordid", secalias, - NULL) < 0) + if (qemuMonitorCreateObjectProps(propsret, "tls-creds-x509", alias, + "s:dir", tlspath, + "s:endpoint", (isListen ? "server": "= client"), + "b:verify-peer", (isListen ? verifype= er : true), + "S:passwordid", secalias, + NULL) < 0) return -1; return 0; @@ -741,26 +743,25 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *alias, virQEMUCapsPtr qemuCaps) { + virBuffer buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; virJSONValuePtr props =3D NULL; - char *tmp =3D NULL; - if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, - certEncSecretAlias, - qemuCaps, &props) < 0) + if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, + certEncSecretAlias, qemuCaps, &props)= < 0) goto cleanup; - if (!(tmp =3D virQEMUBuildObjectCommandlineFromJSONType("tls-creds-x50= 9", - alias, props))) + if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) goto cleanup; - virCommandAddArgList(cmd, "-object", tmp, NULL); + virCommandAddArg(cmd, "-object"); + virCommandAddArgBuffer(cmd, &buf); ret =3D 0; cleanup: + virBufferFreeAndReset(&buf); virJSONValueFree(props); - VIR_FREE(tmp); return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e4f56cf89d..e85efcc980 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -66,6 +66,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr seci= nfo, int qemuBuildTLSx509BackendProps(const char *tlspath, bool isListen, bool verifypeer, + const char *alias, const char *secalias, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 02bc88f863..a6ab73b1af 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -166,11 +166,12 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, src->tlsCertdir, false, src->tlsVerify, + src->tlsAlias, &tlsProps, NULL) < 0) goto cleanup; if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, - NULL, NULL, src->tlsAlias, &tlsProps) < 0) + NULL, NULL, &tlsProps) < 0) goto cleanup; ret =3D 0; @@ -1446,14 +1447,13 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob, const char *secAlias, virJSONValuePtr *secProps, - const char *tlsAlias, virJSONValuePtr *tlsProps) { qemuDomainObjPrivatePtr priv =3D vm->privateData; int rc; virErrorPtr orig_err; - if (!tlsAlias && !secAlias) + if (!tlsProps && !secAlias) return 0; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) @@ -1467,13 +1467,9 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, goto error; } - if (tlsAlias) { - rc =3D qemuMonitorAddObjectType(priv->mon, "tls-creds-x509", - tlsAlias, *tlsProps); - *tlsProps =3D NULL; /* qemuMonitorAddObjectType consumes */ - if (rc < 0) - goto error; - } + if (tlsProps && + qemuMonitorAddObject(priv->mon, tlsProps, NULL) < 0) + goto error; return qemuDomainObjExitMonitor(driver, vm); @@ -1481,7 +1477,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, virErrorPreserveLast(&orig_err); ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&orig_err); - qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias); + qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); return -1; } @@ -1493,6 +1489,7 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, const char *tlsCertdir, bool tlsListen, bool tlsVerify, + const char *alias, virJSONValuePtr *tlsProps, virJSONValuePtr *secProps) { @@ -1506,7 +1503,7 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, } if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, - secAlias, qemuCaps, tlsProps) < 0) + alias, secAlias, qemuCaps, tlsProps) = < 0) return -1; return 0; @@ -1555,12 +1552,12 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr dri= ver, cfg->chardevTLSx509certdir, dev->data.tcp.listen, cfg->chardevTLSx509verify, - &tlsProps, &secProps) < 0) + *tlsAlias, &tlsProps, &secProps) < 0) goto cleanup; dev->data.tcp.tlscreds =3D true; if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, - *secAlias, &secProps, *tlsAlias, &tlsProps= ) < 0) + *secAlias, &secProps, &tlsProps) < 0) goto cleanup; ret =3D 0; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 2059baf47f..f978780c30 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -45,7 +45,6 @@ int qemuDomainAddTLSObjects(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob, const char *secAlias, virJSONValuePtr *secProps, - const char *tlsAlias, virJSONValuePtr *tlsProps); int qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, @@ -53,6 +52,7 @@ int qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, const char *tlsCertdir, bool tlsListen, bool tlsVerify, + const char *alias, virJSONValuePtr *tlsProps, virJSONValuePtr *secProps); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 5976bfdaf2..78688c397f 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -862,7 +862,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo, cfg->migrateTLSx509certdir, tlsListen, cfg->migrateTLSx509verify, - &tlsProps, &secProps) < 0) + *tlsAlias, &tlsProps, &secProps) < 0) goto error; /* Ensure the domain doesn't already have the TLS objects defined... @@ -872,7 +872,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, *tlsAlias); if (qemuDomainAddTLSObjects(driver, vm, asyncJob, secAlias, &secProps, - *tlsAlias, &tlsProps) < 0) + &tlsProps) < 0) goto error; if (qemuMigrationParamsSetString(migParams, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list