From nobody Thu May 15 00:06: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 1519927254426152.23175524142687; Thu, 1 Mar 2018 10:00:54 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C81F80474; Thu, 1 Mar 2018 18:00:52 +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 324AB620BA; Thu, 1 Mar 2018 18:00:52 +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 EA058183390F; Thu, 1 Mar 2018 18:00:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w21I0WGA016987 for ; Thu, 1 Mar 2018 13:00:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2F2FD2024CA8; Thu, 1 Mar 2018 18:00:32 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADAD12024CA6; Thu, 1 Mar 2018 18:00:31 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 1 Mar 2018 18:59:45 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/6] qemu: domain: Return early in qemuDomainObjPrivateXMLFormatJob 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 01 Mar 2018 18:00:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Remove one level of nesting by returing early. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 54 ++++++++++++++++++++++++++--------------------= ---- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e5b494fa2a..b7fb9f264d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2045,36 +2045,38 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, if (!qemuDomainTrackJob(job)) job =3D QEMU_JOB_NONE; - if (job || priv->job.asyncJob) { - virBufferAsprintf(buf, "job.asyncJo= b)); - if (priv->job.phase) { - virBufferAsprintf(buf, " phase=3D'%s'", - qemuDomainAsyncJobPhaseToString( - priv->job.asyncJob, priv->job.phase)); - } - if (priv->job.asyncJob !=3D QEMU_ASYNC_JOB_MIGRATION_OUT) { - virBufferAddLit(buf, "/>\n"); - } else { - size_t i; - virDomainDiskDefPtr disk; - qemuDomainDiskPrivatePtr diskPriv; + if (job =3D=3D QEMU_JOB_NONE && + priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_NONE) + return; - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); + virBufferAsprintf(buf, "job.asyncJob)); + if (priv->job.phase) { + virBufferAsprintf(buf, " phase=3D'%s'", + qemuDomainAsyncJobPhaseToString(priv->job.asyncJ= ob, + priv->job.phase)= ); + } + if (priv->job.asyncJob !=3D QEMU_ASYNC_JOB_MIGRATION_OUT) { + virBufferAddLit(buf, "/>\n"); + } else { + size_t i; + virDomainDiskDefPtr disk; + qemuDomainDiskPrivatePtr diskPriv; - for (i =3D 0; i < vm->def->ndisks; i++) { - disk =3D vm->def->disks[i]; - diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - virBufferAsprintf(buf, "\n", - disk->dst, - diskPriv->migrating ? "yes" : "no"); - } + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + for (i =3D 0; i < vm->def->ndisks; i++) { + disk =3D vm->def->disks[i]; + diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + virBufferAsprintf(buf, "\n", + disk->dst, + diskPriv->migrating ? "yes" : "no"); } + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); } } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list