From nobody Wed May 14 20:27:44 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 1527868304718643.3650264853429; Fri, 1 Jun 2018 08:51:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7DAA300374D; Fri, 1 Jun 2018 15:51:42 +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 92A492010CB5; Fri, 1 Jun 2018 15:51:42 +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 CCE734CA85; 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 w51FpS2M010618 for ; Fri, 1 Jun 2018 11:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 506E12026DFD; Fri, 1 Jun 2018 15:51:28 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id E90DC2026DEF for ; Fri, 1 Jun 2018 15:51:27 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 17:51:07 +0200 Message-Id: <74c94cdefe7f941181b9ca11a21937b0dcb1bdd4.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 4/9] qemu: hotplug: Extract hotplug of PR 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 01 Jun 2018 15:51:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Introduce a new setup function for all the related configuration and move the setup and attachment of the PR code. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_block.c | 8 ++++++++ src/qemu/qemu_block.h | 3 +++ src/qemu/qemu_command.c | 21 +++++++++++++++++++++ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_hotplug.c | 16 ++-------------- 5 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 73aab9d73a..2bc8120f5f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1485,6 +1485,7 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorage= SourceAttachDataPtr data) virJSONValueFree(data->storageProps); virJSONValueFree(data->formatProps); + virJSONValueFree(data->prmgrProps); VIR_FREE(data->driveCmd); VIR_FREE(data->driveAlias); VIR_FREE(data); @@ -1548,6 +1549,10 @@ qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon, { int rv; + if (data->prmgrProps && + qemuMonitorAddObject(mon, &data->prmgrProps, &data->prmgrAlias) < = 0) + return -1; + if (data->storageProps) { rv =3D qemuMonitorBlockdevAdd(mon, data->storageProps); data->storageProps =3D NULL; @@ -1609,6 +1614,9 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr m= on, "qemuMonitorAddDevice", data->driveAlias, data->drive= Cmd); } + if (data->prmgrAlias) + ignore_value(qemuMonitorDelObject(mon, data->prmgrAlias)); + virErrorRestore(&orig_err); } diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 5c7791ee72..e5064574a9 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -71,6 +71,9 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePt= r src); typedef struct qemuBlockStorageSourceAttachData qemuBlockStorageSourceAtta= chData; typedef qemuBlockStorageSourceAttachData *qemuBlockStorageSourceAttachData= Ptr; struct qemuBlockStorageSourceAttachData { + virJSONValuePtr prmgrProps; + char *prmgrAlias; + virJSONValuePtr storageProps; const char *storageNodeName; bool storageAttached; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 84bb857507..af97069770 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10463,3 +10463,24 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomain= DiskDefPtr disk, return data; } + + +/** + * qemuBuildStorageSourceAttachPrepareCommon: + * @src: storage source + * @data: already initialized data for disk source addition + * + * Prepare data for configuration associated with the disk source such as + * secrets/TLS/pr objects etc ... + */ +int +qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, + qemuBlockStorageSourceAttachData= Ptr data) +{ + if (src->pr && + !virStoragePRDefIsManaged(src->pr) && + !(data->prmgrProps =3D qemuBuildPRManagerInfoProps(src))) + return -1; + + return 0; +} diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 04f6245bc7..711fce9648 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -106,6 +106,9 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk= ); qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps); +int +qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, + qemuBlockStorageSourceAttachData= Ptr data); /* Current, best practice */ char *qemuBuildDriveDevStr(const virDomainDef *def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ece9a82562..7ea5a531f3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -394,14 +394,12 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, qemuBlockStorageSourceAttachDataPtr data =3D NULL; virErrorPtr orig_err; char *devstr =3D NULL; - char *unmanagedPrmgrAlias =3D NULL; char *managedPrmgrAlias =3D NULL; char *encobjAlias =3D NULL; char *secobjAlias =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virJSONValuePtr secobjProps =3D NULL; virJSONValuePtr encobjProps =3D NULL; - virJSONValuePtr unmanagedPrmgrProps =3D NULL; virJSONValuePtr managedPrmgrProps =3D NULL; qemuDomainStorageSourcePrivatePtr srcPriv; qemuDomainSecretInfoPtr secinfo =3D NULL; @@ -433,12 +431,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuDomainDiskAttachManagedPR(vm, disk, &managedPrmgrProps) < 0) goto error; - if (disk->src->pr && - !virStoragePRDefIsManaged(disk->src->pr) && - !(unmanagedPrmgrProps =3D qemuBuildPRManagerInfoProps(disk->src))) + if (!(data =3D qemuBuildStorageSourceAttachPrepareDrive(disk, priv->qe= muCaps))) goto error; - if (!(data =3D qemuBuildStorageSourceAttachPrepareDrive(disk, priv->qe= muCaps))) + if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data) < 0) goto error; if (disk->src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES && @@ -465,10 +461,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, qemuMonitorAddObject(priv->mon, &managedPrmgrProps, &managedPrmgrA= lias) < 0) goto exit_monitor; - if (unmanagedPrmgrProps && - qemuMonitorAddObject(priv->mon, &unmanagedPrmgrProps, &unmanagedPr= mgrAlias) < 0) - goto exit_monitor; - if (qemuBlockStorageSourceAttachApply(priv->mon, data) < 0) goto exit_monitor; @@ -488,12 +480,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, cleanup: qemuBlockStorageSourceAttachDataFree(data); virJSONValueFree(managedPrmgrProps); - virJSONValueFree(unmanagedPrmgrProps); virJSONValueFree(encobjProps); virJSONValueFree(secobjProps); qemuDomainSecretDiskDestroy(disk); VIR_FREE(managedPrmgrAlias); - VIR_FREE(unmanagedPrmgrAlias); VIR_FREE(secobjAlias); VIR_FREE(encobjAlias); VIR_FREE(devstr); @@ -508,8 +498,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, secobjAlias)); if (encobjAlias) ignore_value(qemuMonitorDelObject(priv->mon, encobjAlias)); - if (unmanagedPrmgrAlias) - ignore_value(qemuMonitorDelObject(priv->mon, unmanagedPrmgrAlias)); if (managedPrmgrAlias) ignore_value(qemuMonitorDelObject(priv->mon, managedPrmgrAlias)); if (disk->src->tlsAlias) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list