From nobody Thu Mar 28 19:54:30 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1567693219; cv=none; d=zoho.com; s=zohoarc; b=LixmmJWDY14HZmTDOrsshbvaYdSvhIoyuOPiy/Kh27QdaIJD5SGpba2GCxpi4MS+El1juetUT2NhJyLwcGXv7du3idUvT0CbwRNMfjs1XFjpynTQcVCvGU2Ne+M0Dibl3Wijpcxb+arWOnNybKRYWZXrg6YEZ1ynG4yDqO9UiK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567693219; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KuGsw0PlQWTS4ypgbtEoyFTaV/F0boND30r8mODIzrI=; b=HsYM70DSB2ybV0kv+01o30CWaMt0UK+qZKs7GKYOQmG0zR944EyyM3YrgiFeRBA+J7f+l2tBZRqT3pT0KbjqRqiJd5Zjzp+hrE/o/YKIZtJG+8m/kLXTS+g0qUuNj8C6TexWU/QLEdQV4veJVr3F7PiJRSllC7gRzlKQLGF+xuA= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567693219844912.6915816767489; Thu, 5 Sep 2019 07:20:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED345307D915; Thu, 5 Sep 2019 14:20:17 +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 C05E619C6A; Thu, 5 Sep 2019 14:20:17 +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 797992551E; Thu, 5 Sep 2019 14:20:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x85EKEq8006247 for ; Thu, 5 Sep 2019 10:20:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7374B60127; Thu, 5 Sep 2019 14:20:14 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E688960167 for ; Thu, 5 Sep 2019 14:20:13 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 5 Sep 2019 16:20:04 +0200 Message-Id: <2e560ad05c09be2ced2ac0899c95a8082873d55d.1567693128.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemu: hotplug: Simplify cleanup in qemuDomainChangeMediaLegacy 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: , 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 05 Sep 2019 14:20:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Switch to using VIR_AUTOFREE and remove the cleanup label. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63acb9c451..c91dfc9f6b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -258,48 +258,48 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, virStorageSourcePtr newsrc, bool force) { - int ret =3D -1, rc; - char *driveAlias =3D NULL; + int rc; + VIR_AUTOFREE(char *) driveAlias =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); const char *format =3D NULL; - char *sourcestr =3D NULL; + VIR_AUTOFREE(char *) sourcestr =3D NULL; if (!disk->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing disk device alias name for %s"), disk->d= st); - goto cleanup; + return -1; } if (!(driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) - goto cleanup; + return -1; qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, force); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; /* If the tray is present wait for it to open. */ if (!force && diskPriv->tray) { rc =3D qemuHotplugWaitForTrayEject(vm, disk); if (rc < 0) - goto cleanup; + return -1; /* re-issue ejection command to pop out the media */ qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, false); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - goto cleanup; + return -1; } else { /* otherwise report possible errors from the attempt to eject the = media*/ if (rc < 0) - goto cleanup; + return -1; } if (!virStorageSourceIsEmpty(newsrc)) { if (qemuGetDriveSourceString(newsrc, NULL, &sourcestr) < 0) - goto cleanup; + return -1; if (virStorageSourceGetActualType(newsrc) !=3D VIR_STORAGE_TYPE_DI= R) format =3D virStorageFileFormatTypeToString(newsrc->format); @@ -310,18 +310,13 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, sourcestr, format); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; } if (rc < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - VIR_FREE(driveAlias); - VIR_FREE(sourcestr); - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 19:54:30 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1567693222; cv=none; d=zoho.com; s=zohoarc; b=WgnAn/89g4KaQUOcWDsvTHTb2Qksm7LIwTla4p2rA5gyD7j7Hv1XX0c/fjDvOmRcub6zBsnlPs8xshdxwPOrx/BfA/W9aCyj5+7oFuO0R4p8HI7Qko6IGAmjVyxi+V2FZ6aOMDKrJ0wsS8Qw9G4egpPSn7OF3xz3y5qX0kbLZJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567693222; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=nbYn8f9V9wo8PXYVRUEiZfpzvE1dRwAwd13Lz7OLB14=; b=X3IMn9OFOG31eulhM4SDv9MG6tcIOukUnIzPh4Z2yC2XI9KPciq4p8xcKE3rrWUUC1z2WWp74klmRM0HuGl1v1qaOBIo91ZnzF59tIUvHoFySQNCh+zezTJz0umMbRXHqEY+annkPMDxu5FQcgFjUABgo5fwikaxE2Cum9pasVo= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567693222534665.4505358711237; Thu, 5 Sep 2019 07:20:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20AC918C4283; Thu, 5 Sep 2019 14:20:21 +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 EDCC41001281; Thu, 5 Sep 2019 14:20:20 +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 AAA78180221F; Thu, 5 Sep 2019 14:20:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x85EKFDt006257 for ; Thu, 5 Sep 2019 10:20:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5022260127; Thu, 5 Sep 2019 14:20:15 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4B5F60467 for ; Thu, 5 Sep 2019 14:20:14 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 5 Sep 2019 16:20:05 +0200 Message-Id: <621eeb5758e5e5018b48103c026c83ee05083336.1567693128.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] qemu: hotplug: Use VIR_AUTOFREE in qemuDomainAttachDiskGeneric 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: , 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 05 Sep 2019 14:20:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Get rid of the last manually freed var. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c91dfc9f6b..30aa6d2344 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -613,7 +613,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, VIR_AUTOPTR(qemuBlockStorageSourceChainData) data =3D NULL; int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_AUTOPTR(virJSONValue) corProps =3D NULL; VIR_AUTOFREE(char *) corAlias =3D NULL; @@ -679,7 +679,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, cleanup: qemuDomainSecretDiskDestroy(disk); - VIR_FREE(devstr); return ret; exit_monitor: --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 19:54:30 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1567693224; cv=none; d=zoho.com; s=zohoarc; b=KFhMef0XiQSkWjqmfMcg/hKQkc+mUjY3m/EuorZXURIpwOmV7KSmtIWtIvHwSj9/uk2xkGeVNaHIvaLfkfwkS0Lp86TBuS+CBh64A8W/esclqQDDo389BZbLRrYwN4LQKB4sy4gojH32TyawEDrgIHyaQLFKbckZR77E+b1BF+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567693224; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=19z6YPeAxIktyXTBC744T0ZxEjPQjM35RxLHaTG51OU=; b=bQASS+nTNeqa6E2epUgpFdNnxg7KVPWjqGxt+1wsyB8zIBsbuIBLGtYXoQMgQWnfFFPyy0dwZRnSMuX0zS+H3/q1OgGEqWQzVBsI4CAwPq9cCj8KHQFhXn+UFZIfqk1Mr5fLKj/QkfMKyLS271BHXsZMTy1zOMnb+OZpbdu9Dfg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567693224377781.7337233743324; Thu, 5 Sep 2019 07:20:24 -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 0D6421DAB; Thu, 5 Sep 2019 14:20:23 +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 D990060920; Thu, 5 Sep 2019 14:20:22 +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 8F9A724FDE; Thu, 5 Sep 2019 14:20:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x85EKGPm006262 for ; Thu, 5 Sep 2019 10:20:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E02260127; Thu, 5 Sep 2019 14:20:16 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2599601B7 for ; Thu, 5 Sep 2019 14:20:15 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 5 Sep 2019 16:20:06 +0200 Message-Id: <796b60b20207cd3235b0fbe84243f0c298c97d2e.1567693128.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] qemu: hotplug: Setup disk throttling with blockdev 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: , 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.6.2 (mx1.redhat.com [10.5.110.71]); Thu, 05 Sep 2019 14:20:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" With blockdev we must issue the block_set_io_throttle QMP command to setup disk throttling as we currently can't do it with the 'throttle' layer. Unfortunately there's nothing we can do if it fails. https://bugzilla.redhat.com/show_bug.cgi?id=3D1733163 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 18 +++++++++++++++++- src/qemu/qemu_process.c | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 30aa6d2344..a7034fd298 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -617,6 +617,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_AUTOPTR(virJSONValue) corProps =3D NULL; VIR_AUTOFREE(char *) corAlias =3D NULL; + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0) goto cleanup; @@ -627,7 +628,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto error; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (blockdev) { if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && !(corProps =3D qemuBlockStorageGetCopyOnReadProps(disk))) goto cleanup; @@ -667,6 +668,21 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, goto exit_monitor; } + /* Setup throttling of disk via block_set_io_throttle QMP command. This + * is a hack until the 'throttle' blockdev driver will support modific= ation + * of the trhottle group. See also qemuProcessSetupDiskThrottlingBlock= dev. + * As there isn't anything sane to do if this fails, let's just return + * success. + */ + if (blockdev && + qemuDiskConfigBlkdeviotuneEnabled(disk)) { + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); + if (qemuMonitorSetBlockIoThrottle(priv->mon, NULL, diskPriv->qomNa= me, + &disk->blkdeviotune, + true, true, true) < 0) + VIR_WARN("failed to set blkdeviotune for '%s' of '%s'", disk->= dst, vm->def->name); + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret =3D -2; goto error; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c9921646e9..61b03c8a2d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6671,6 +6671,7 @@ qemuProcessGenID(virDomainObjPtr vm, * Sets up disk trottling for -blockdev via block_set_io_throttle monitor * command. This hack should be replaced by proper use of the 'throttle' * blockdev driver in qemu once it will support changing of the throttle g= roup. + * Same hack is done in qemuDomainAttachDiskGeneric. */ static int qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriverPtr driver, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list