From nobody Fri Apr 19 19:17:54 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=1637692533; cv=none; d=zohomail.com; s=zohoarc; b=Ey2BNH/kt4NsaaoJ9Wcn1iDF6u1HoKz7dPQfsFqw14e1UL2MuFKy2O22k+GC/IjdZdU4sgRBBpVeJBRJ8q5DlKpbxPpPg35tLPfYou7uMkrU/kbHENO9jdJpaVZlbpIKM7wmth0+A3tJLlCHwoyB6z5EmVfn3IiKmO+U2NizIac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637692533; 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=TfQLYXBxd4Yxr7y/UNsoHxoypbSHxsvQpxxFQFIPT4s=; b=GaiD7sigWv1/5rIJvuYAz0q64V5TKJdfrZK54qWuuSQ0u8jBLfWi7UhZXveiAJJBJgaYbWoPcjEkXAgdkac2q9wO6Q3wwKh9QwTL5AGQAKD3MWxhiANnz+SquMhSDGdcFgDVDWf04hnroJg5vox6ClnyBL5RrW2xZs/gLKE8huQ= 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 1637692533347265.69370663691666; Tue, 23 Nov 2021 10:35:33 -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-604-9tyL_td2MNGEysCErQaz2Q-1; Tue, 23 Nov 2021 13:35:28 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99DA51006AA0; Tue, 23 Nov 2021 18:35:23 +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 E9F1F1972E; Tue, 23 Nov 2021 18:35: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 8166D1832E7F; Tue, 23 Nov 2021 18:35:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ANIZJCH031810 for ; Tue, 23 Nov 2021 13:35:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9279B1972E; Tue, 23 Nov 2021 18:35:19 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AE6A19D9F for ; Tue, 23 Nov 2021 18:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637692532; 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=TfQLYXBxd4Yxr7y/UNsoHxoypbSHxsvQpxxFQFIPT4s=; b=ZYkKzwVD6SB0w1WdBD7hQKYndgfgDQuI7QkbCJRfOiP8RU1Tnz7/6KG04PDmHIDfGhKjLy 8zJmwTZzQ1llfFxplQh8VvT5YBV5/3/J3oyDwWtDt7/6QoUxcKU1dZsARdmjw4Vzd/Ab06 DWMWFM9yY7/N0Qw/C7C8nOUCClMdiyg= X-MC-Unique: 9tyL_td2MNGEysCErQaz2Q-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] qemu: Rewrite code to the pattern Date: Tue, 23 Nov 2021 19:35:07 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.84 on 10.5.11.23 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: 1637692535352100001 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 --- src/qemu/qemu_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1959b639da..b938687189 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16231,10 +16231,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, q= devid, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; - if (ret < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) goto endjob; + ret =3D -1; } =20 @@ -16362,9 +16361,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevi= d, &reply); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - if (ret < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) goto endjob; } =20 @@ -17375,10 +17372,7 @@ 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; - - if (rv < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto endjob; } =20 --=20 2.31.1