From nobody Wed May 14 07:22:51 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 1527700069275730.2278732286667; Wed, 30 May 2018 10:07:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64104AC5ED; Wed, 30 May 2018 17:07:47 +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 165165FC20; Wed, 30 May 2018 17:07:47 +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 6A2954CA83; Wed, 30 May 2018 17:07:46 +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 w4UH6vqA007346 for ; Wed, 30 May 2018 13:06:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2EF502026DEF; Wed, 30 May 2018 17:06:57 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id C84912026DFD 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:35 +0200 Message-Id: <3fbbe8a0553bbf60c83581e52eefc9e1ae42e10a.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 11/13] qemu: hotplug: Refactor 'secret' 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 30 May 2018 17:07:48 +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_command.c | 31 +++++++--------- src/qemu/qemu_hotplug.c | 77 ++++++++++++++++--------------------= ---- src/qemu/qemu_hotplug.h | 1 - src/qemu/qemu_migration_params.c | 3 +- 4 files changed, 45 insertions(+), 67 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 00ca557025..a4dfda3f14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -511,18 +511,14 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr seci= nfo, if (!(keyid =3D qemuDomainGetMasterKeyAlias())) return -1; - if (virJSONValueObjectCreate(propsret, - "s:data", secinfo->s.aes.ciphertext, - "s:keyid", keyid, - "s:iv", secinfo->s.aes.iv, - "s:format", "base64", NULL) < 0) - goto cleanup; - - ret =3D 0; + ret =3D qemuMonitorCreateObjectProps(propsret, + "secret", secinfo->s.aes.alias, + "s:data", secinfo->s.aes.ciphertext, + "s:keyid", keyid, + "s:iv", secinfo->s.aes.iv, + "s:format", "base64", NULL); - cleanup: VIR_FREE(keyid); - return ret; } @@ -543,25 +539,24 @@ static int qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { + virBuffer buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; virJSONValuePtr props =3D NULL; - char *tmp =3D NULL; if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; - if (!(tmp =3D virQEMUBuildObjectCommandlineFromJSONType("secret", - secinfo->s.aes.a= lias, - props))) + if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) goto cleanup; - virCommandAddArgList(cmd, "-object", tmp, NULL); - ret =3D 0; + 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_hotplug.c b/src/qemu/qemu_hotplug.c index a6ab73b1af..6e7245a481 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -171,7 +171,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, goto cleanup; if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, - NULL, NULL, &tlsProps) < 0) + NULL, &tlsProps) < 0) goto cleanup; ret =3D 0; @@ -423,9 +423,9 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, char *drivestr =3D NULL; char *drivealias =3D NULL; char *prmgrAlias =3D NULL; + char *encobjAlias =3D NULL; + char *secobjAlias =3D NULL; bool driveAdded =3D false; - bool secobjAdded =3D false; - bool encobjAdded =3D false; bool prdStarted =3D false; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virJSONValuePtr secobjProps =3D NULL; @@ -487,23 +487,13 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); - if (secobjProps) { - rv =3D qemuMonitorAddObjectType(priv->mon, "secret", secinfo->s.ae= s.alias, - secobjProps); - secobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ - if (rv < 0) - goto exit_monitor; - secobjAdded =3D true; - } + if (secobjProps && + qemuMonitorAddObject(priv->mon, &secobjProps, &secobjAlias) < 0) + goto exit_monitor; - if (encobjProps) { - rv =3D qemuMonitorAddObjectType(priv->mon, "secret", encinfo->s.ae= s.alias, - encobjProps); - encobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ - if (rv < 0) - goto exit_monitor; - encobjAdded =3D true; - } + if (encobjProps && + qemuMonitorAddObject(priv->mon, &encobjProps, &encobjAlias) < 0) + goto exit_monitor; if (prmgrProps && qemuMonitorAddObject(priv->mon, &prmgrProps, &prmgrAlias) < 0) @@ -532,6 +522,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virJSONValueFree(secobjProps); qemuDomainSecretDiskDestroy(disk); VIR_FREE(prmgrAlias); + VIR_FREE(secobjAlias); + VIR_FREE(encobjAlias); VIR_FREE(drivealias); VIR_FREE(drivestr); VIR_FREE(devstr); @@ -544,10 +536,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, VIR_WARN("Unable to remove drive %s (%s) after failed " "qemuMonitorAddDevice", drivealias, drivestr); } - if (secobjAdded) - ignore_value(qemuMonitorDelObject(priv->mon, secinfo->s.aes.alias)= ); - if (encobjAdded) - ignore_value(qemuMonitorDelObject(priv->mon, encinfo->s.aes.alias)= ); + if (secobjAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secobjAlias)); + if (encobjAlias) + ignore_value(qemuMonitorDelObject(priv->mon, encobjAlias)); if (prmgrAlias) ignore_value(qemuMonitorDelObject(priv->mon, prmgrAlias)); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -1445,32 +1437,29 @@ int qemuDomainAddTLSObjects(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, - const char *secAlias, virJSONValuePtr *secProps, virJSONValuePtr *tlsProps) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int rc; virErrorPtr orig_err; + char *secAlias =3D NULL; - if (!tlsProps && !secAlias) + if (!tlsProps && !secProps) return 0; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - if (secAlias) { - rc =3D qemuMonitorAddObjectType(priv->mon, "secret", - secAlias, *secProps); - *secProps =3D NULL; /* qemuMonitorAddObjectType consumes */ - if (rc < 0) - goto error; - } + if (secProps && + qemuMonitorAddObject(priv->mon, secProps, &secAlias) < 0) + goto error; if (tlsProps && qemuMonitorAddObject(priv->mon, tlsProps, NULL) < 0) goto error; + VIR_FREE(secAlias); + return qemuDomainObjExitMonitor(driver, vm); error: @@ -1478,6 +1467,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); + VIR_FREE(secAlias); return -1; } @@ -1557,7 +1547,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr drive= r, dev->data.tcp.tlscreds =3D true; if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, - *secAlias, &secProps, &tlsProps) < 0) + &secProps, &tlsProps) < 0) goto cleanup; ret =3D 0; @@ -2305,18 +2295,17 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr dri= ver, virDomainHostdevDefPtr hostdev) { size_t i; - int rv; int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; char *devstr =3D NULL; char *drvstr =3D NULL; char *drivealias =3D NULL; + char *secobjAlias =3D NULL; bool teardowncgroup =3D false; bool teardownlabel =3D false; bool teardowndevice =3D false; bool driveAdded =3D false; - bool secobjAdded =3D false; virJSONValuePtr secobjProps =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; qemuDomainSecretInfoPtr secinfo =3D NULL; @@ -2385,14 +2374,9 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driv= er, qemuDomainObjEnterMonitor(driver, vm); - if (secobjProps) { - rv =3D qemuMonitorAddObjectType(priv->mon, "secret", secinfo->s.ae= s.alias, - secobjProps); - secobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ - if (rv < 0) - goto exit_monitor; - secobjAdded =3D true; - } + if (secobjProps && + qemuMonitorAddObject(priv->mon, &secobjProps, &secobjAlias) < 0) + goto exit_monitor; if (qemuMonitorAddDrive(priv->mon, drvstr) < 0) goto exit_monitor; @@ -2424,6 +2408,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr drive= r, } qemuDomainSecretHostdevDestroy(hostdev); virJSONValueFree(secobjProps); + VIR_FREE(secobjAlias); VIR_FREE(drivealias); VIR_FREE(drvstr); VIR_FREE(devstr); @@ -2436,8 +2421,8 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr drive= r, "qemuMonitorAddDevice", drvstr, devstr); } - if (secobjAdded) - ignore_value(qemuMonitorDelObject(priv->mon, secinfo->s.aes.alias)= ); + if (secobjAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secobjAlias)); ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&orig_err); diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index f978780c30..6c952df38c 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -43,7 +43,6 @@ void qemuDomainDelTLSObjects(virQEMUDriverPtr driver, int qemuDomainAddTLSObjects(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, - const char *secAlias, virJSONValuePtr *secProps, virJSONValuePtr *tlsProps); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 78688c397f..7b0862575f 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -871,8 +871,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, * some other error path between now and perform . */ qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, *tlsAlias); - if (qemuDomainAddTLSObjects(driver, vm, asyncJob, secAlias, &secProps, - &tlsProps) < 0) + if (qemuDomainAddTLSObjects(driver, vm, asyncJob, &secProps, &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