From nobody Tue Dec 16 08:36:45 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 1524489332385140.2016960153561; Mon, 23 Apr 2018 06:15:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF98D8765D; Mon, 23 Apr 2018 13:15:30 +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 704B167654; Mon, 23 Apr 2018 13:15:30 +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 AC19565D17; Mon, 23 Apr 2018 13:15:29 +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 w3NDF3Ev022125 for ; Mon, 23 Apr 2018 09:15:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4096E215CDC8; Mon, 23 Apr 2018 13:15:03 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C7D1215CDCC; Mon, 23 Apr 2018 13:15:02 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 15:14:44 +0200 Message-Id: <3ff6480d2485675aedf46a0b2ea303401c258dfb.1524489077.git.mprivozn@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 Cc: pkrempa@redhat.com Subject: [libvirt] [PATCH v5 09/11] qemu_hotplug: Hotplug of reservations 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 23 Apr 2018 13:15:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When attaching a disk that requires pr-manager we might need to plug the pr-manager object and start the pr-helper process. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/qemu/qemu_hotplug.c | 93 +++++++++++++++++++++++++++++++++++++++++++++= ++-- src/qemu/qemu_process.c | 4 +-- src/qemu/qemu_process.h | 5 +++ 3 files changed, 97 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index df9e8aa716..2e736873d1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -348,6 +348,63 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, } =20 =20 +/** + * qemuDomainMaybeStartPRDaemon: + * @vm: domain object + * @disk: disk to hotplug + * + * Checks if it's needed to start qemu-pr-helper and starts it. + * + * Returns: 0 if qemu-pr-helper is not needed + * 1 if it is needed and was started + * -1 otherwise. + */ +static int +qemuDomainMaybeStartPRDaemon(virDomainObjPtr vm, + virDomainDiskDefPtr disk) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + + if (!virStoragePRDefIsManaged(disk->src->pr)) { + /* @disk itself does not require qemu-pr-helper. */ + return 0; + } + + if (priv->prDaemonRunning) { + /* @disk requires qemu-pr-helper but there's already one running. = */ + return 0; + } + + /* @disk requires qemu-pr-helper but none is running. + * Start it now. */ + if (qemuProcessStartPRDaemon(vm, disk) < 0) + return -1; + + return 1; +} + + +static int +qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm, + const virDomainDiskDef *disk, + virJSONValuePtr *propsret, + char **aliasret) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + + *propsret =3D NULL; + *aliasret =3D NULL; + + if (virStoragePRDefIsManaged(disk->src->pr) && + priv->prDaemonRunning) { + /* @disk requires qemu-pr-helper but there's already one running. = */ + return 0; + } + + return qemuBuildPRManagerInfoProps(vm, disk, propsret, aliasret); +} + + /** * qemuDomainAttachDiskGeneric: * @@ -365,12 +422,16 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, char *devstr =3D NULL; char *drivestr =3D NULL; char *drivealias =3D NULL; + char *prmgrAlias =3D NULL; bool driveAdded =3D false; bool secobjAdded =3D false; bool encobjAdded =3D false; + bool prmgrAdded =3D false; + bool prdStarted =3D false; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virJSONValuePtr secobjProps =3D NULL; virJSONValuePtr encobjProps =3D NULL; + virJSONValuePtr prmgrProps =3D NULL; qemuDomainStorageSourcePrivatePtr srcPriv; qemuDomainSecretInfoPtr secinfo =3D NULL; qemuDomainSecretInfoPtr encinfo =3D NULL; @@ -398,6 +459,17 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (encinfo && qemuBuildSecretInfoProps(encinfo, &encobjProps) < 0) goto error; =20 + if (qemuMaybeBuildPRManagerInfoProps(vm, disk, &prmgrProps, &prmgrAlia= s) < 0) + goto error; + + /* Start daemon only after prmgrProps is built. Otherwise + * qemuDomainMaybeStartPRDaemon() might start daemon and set + * priv->prDaemonRunning which confuses props building code. */ + if ((rv =3D qemuDomainMaybeStartPRDaemon(vm, disk)) < 0) + goto error; + else if (rv > 0) + prdStarted =3D true; + if (disk->src->haveTLS && qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src, disk->info.alias) < 0) @@ -435,6 +507,15 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, encobjAdded =3D true; } =20 + if (prmgrProps) { + rv =3D qemuMonitorAddObject(priv->mon, "pr-manager-helper", prmgrA= lias, + prmgrProps); + prmgrProps =3D NULL; /* qemuMonitorAddObject consumes */ + if (rv < 0) + goto exit_monitor; + prmgrAdded =3D true; + } + if (qemuMonitorAddDrive(priv->mon, drivestr) < 0) goto exit_monitor; driveAdded =3D true; @@ -453,12 +534,14 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virJSONValueFree(secobjProps); + virJSONValueFree(prmgrProps); virJSONValueFree(encobjProps); + virJSONValueFree(secobjProps); qemuDomainSecretDiskDestroy(disk); - VIR_FREE(devstr); - VIR_FREE(drivestr); + VIR_FREE(prmgrAlias); VIR_FREE(drivealias); + VIR_FREE(drivestr); + VIR_FREE(devstr); virObjectUnref(cfg); return ret; =20 @@ -472,6 +555,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, secinfo->s.aes.alias)= ); if (encobjAdded) ignore_value(qemuMonitorDelObject(priv->mon, encinfo->s.aes.alias)= ); + if (prmgrAdded) + ignore_value(qemuMonitorDelObject(priv->mon, prmgrAlias)); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -2; virErrorRestore(&orig_err); @@ -481,6 +566,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, error: qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true= )); + if (prdStarted) + qemuProcessKillPRDaemon(vm); goto cleanup; } =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 36cfa438ed..b0c22001d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2565,7 +2565,7 @@ qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr v= m, } =20 =20 -static void +void qemuProcessKillPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -2629,7 +2629,7 @@ qemuProcessStartPRDaemonHook(void *opaque) } =20 =20 -static int +int qemuProcessStartPRDaemon(virDomainObjPtr vm, const virDomainDiskDef *disk) { diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 3bf66f71b7..eda6695415 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -205,4 +205,9 @@ int qemuProcessRefreshDisks(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); =20 +int qemuProcessStartPRDaemon(virDomainObjPtr vm, + const virDomainDiskDef *disk); + +void qemuProcessKillPRDaemon(virDomainObjPtr vm); + #endif /* __QEMU_PROCESS_H__ */ --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list