From nobody Tue Dec 16 08:04:20 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 1524489327817898.0683716339988; Mon, 23 Apr 2018 06:15:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 271223130D64; Mon, 23 Apr 2018 13:15:26 +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 A7DC018A49; Mon, 23 Apr 2018 13:15:25 +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 20D0C65D15; Mon, 23 Apr 2018 13:15:25 +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 w3NDF4Ii022135 for ; Mon, 23 Apr 2018 09:15:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3ABD7215CDCB; Mon, 23 Apr 2018 13:15:04 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C6D2215CDCC; Mon, 23 Apr 2018 13:15:03 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 15:14:45 +0200 Message-Id: <8ba60cbea099ee4dc027ba7ae5f2a73bb76ee1b4.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 10/11] qemu_hotplug: Hotunplug 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 23 Apr 2018 13:15:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If we are the last one to use pr-manager object we need to remove it and also kill the qemu-pr-helper process. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/qemu/qemu_hotplug.c | 56 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 56 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2e736873d1..e9dd8a4532 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3824,6 +3824,49 @@ static bool qemuIsMultiFunctionDevice(virDomainDefPt= r def, } =20 =20 +static int +qemuDomainDiskNeedRemovePR(virDomainObjPtr vm, + virDomainDiskDefPtr disk, + char **aliasret, + bool *stopDaemon) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + size_t i; + + *aliasret =3D NULL; + *stopDaemon =3D false; + + if (!virStoragePRDefIsEnabled(disk->src->pr)) + return 0; + + if (!virStoragePRDefIsManaged(disk->src->pr)) { + *aliasret =3D qemuDomainGetUnmanagedPRAlias(disk); + return *aliasret ? 0 : -1; + } + + for (i =3D 0; i < vm->def->ndisks; i++) { + const virDomainDiskDef *domainDisk =3D vm->def->disks[i]; + + if (domainDisk =3D=3D disk) + continue; + + if (virStoragePRDefIsManaged(domainDisk->src->pr)) + break; + } + + if (i !=3D vm->def->ndisks) + return 0; + + if (VIR_STRDUP(*aliasret, qemuDomainGetManagedPRAlias()) < 0) + return -1; + + if (priv->prDaemonRunning) + *stopDaemon =3D true; + + return 0; +} + + static int qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3837,6 +3880,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, char *drivestr; char *objAlias =3D NULL; char *encAlias =3D NULL; + char *prmgrAlias =3D NULL; + bool stopPRDaemon =3D false; =20 VIR_DEBUG("Removing disk %s from domain %p %s", disk->info.alias, vm, vm->def->name); @@ -3874,6 +3919,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, } } =20 + if (qemuDomainDiskNeedRemovePR(vm, disk, &prmgrAlias, &stopPRDaemon) <= 0) + return -1; + qemuDomainObjEnterMonitor(driver, vm); =20 qemuMonitorDriveDel(priv->mon, drivestr); @@ -3889,6 +3937,11 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, encAlias)); VIR_FREE(encAlias); =20 + /* If it fails, then so be it - it was a best shot */ + if (prmgrAlias) + ignore_value(qemuMonitorDelObject(priv->mon, prmgrAlias)); + VIR_FREE(prmgrAlias); + if (disk->src->haveTLS) ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias)); =20 @@ -3907,6 +3960,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, } } =20 + if (stopPRDaemon) + qemuProcessKillPRDaemon(vm); + qemuDomainReleaseDeviceAddress(vm, &disk->info, src); =20 if (qemuSecurityRestoreDiskLabel(driver, vm, disk) < 0) --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list