From nobody Fri Mar 29 01:30:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1637753199; cv=none; d=zohomail.com; s=zohoarc; b=b1hMNXbLB1zQJMLIxFW93mCgXGurlRrhgVIqh54xrtpA4tp5D6wqpe5dGQrOQVrwQ4ME+G6dGMiLUGrSI6EK7dJx9WBmPfsPCi1EU2ofoZo82F+AcerwV5s7Pq3X1vogS27J1xaltL+RckL197hOHZCDI6lRNBDAl5gfdYtw0+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637753199; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iwgVXXhgeuO6UxioF0sEpQdX7wpVOLoCrYz5PLZ1j4A=; b=ExSHkcBTHUTrfmATD8pO8KRrmJBoIxe6Zb1IqT88iycWnqT3wB2/vGxSKQaokGhzhFIV/XGjaeUQioJK2Oafgn0maRR60IfXVEfO1wIKT08XEQOSEy2b0HUWTlk5o8EdXNYYxS4vs0QxC5Ob6rr/7+wwVoX6Kc7TZItNbg5axl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637753199246540.9759081650728; Wed, 24 Nov 2021 03:26:39 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-22ld1PNaMhWxx71DvQwc6g-1; Wed, 24 Nov 2021 06:26:15 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AA14102CB3A; Wed, 24 Nov 2021 11:26:10 +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 4BEE04ABA9; Wed, 24 Nov 2021 11:26:10 +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 A35264BB7C; Wed, 24 Nov 2021 11:26:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AOBQ9nx024748 for ; Wed, 24 Nov 2021 06:26:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 309882AF6D; Wed, 24 Nov 2021 11:26:09 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADA2B60854 for ; Wed, 24 Nov 2021 11:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637753198; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iwgVXXhgeuO6UxioF0sEpQdX7wpVOLoCrYz5PLZ1j4A=; b=OZMECQsBefmUGZ9f5Igh22uXEi+UO5r5Bx6G2vC8c57fQd/p5eec++ouuStYRVa2fhTSVk YfnQr6uRIbo43NsPD7RwkJiC5VmDAOJPniiV1vXZlvkAOeWswk+Wa6J4aO82EnMIlA6H1O 1VzXlgTVutJ6f0HprCnIMpdEuea+AM8= X-MC-Unique: 22ld1PNaMhWxx71DvQwc6g-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2] qemu: Rewrite code to the pattern Date: Wed, 24 Nov 2021 12:25:35 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637753200136100001 Content-Type: text/plain; charset="utf-8" I have seen this pattern a lot in the project, so I decided to rewrite code I stumbled upon to the same pattern as well. Signed-off-by: Kristina Hanicova Reviewed-by: Martin Kletzander --- This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-Novembe= r/msg00747.html Diff to v1: * adding variable 'rc' to fix buggy code and keep the code equivalent (suggested by Jano) src/qemu/qemu_driver.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1959b639da..5c4b493f64 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15975,6 +15975,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; + int rc =3D 0; size_t i; virDomainDiskDef *conf_disk =3D NULL; virDomainDiskDef *disk; @@ -16229,13 +16230,10 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, !virStorageSourceIsEmpty(disk->src)) { =20 qemuDomainObjEnterMonitor(driver, vm); - ret =3D qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, q= devid, - &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; - if (ret < 0) + rc =3D qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, qd= evid, &info); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) goto endjob; - ret =3D -1; } =20 virDomainDiskSetBlockIOTune(disk, &info); @@ -16310,6 +16308,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; + int rc =3D 0; int maxparams; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -16361,10 +16360,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, goto endjob; } qemuDomainObjEnterMonitor(driver, vm); - ret =3D qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevi= d, &reply); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - if (ret < 0) + rc =3D qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid= , &reply); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) goto endjob; } =20 @@ -17375,10 +17373,8 @@ qemuDomainSetTime(virDomainPtr dom, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { qemuDomainObjEnterMonitor(driver, vm); rv =3D qemuMonitorRTCResetReinjection(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; =20 - if (rv < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto endjob; } =20 --=20 2.31.1