From nobody Mon Feb 9 07:55:56 2026 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 1551860490530725.5860550765501; Wed, 6 Mar 2019 00:21:30 -0800 (PST) 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 DF15F3092656; Wed, 6 Mar 2019 08:21:28 +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 611991A91B; Wed, 6 Mar 2019 08:21:28 +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 1CC54181A26F; Wed, 6 Mar 2019 08:21:28 +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 x268L65l032586 for ; Wed, 6 Mar 2019 03:21:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 677F51A91B; Wed, 6 Mar 2019 08:21:06 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF0611A267 for ; Wed, 6 Mar 2019 08:21:05 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 6 Mar 2019 09:20:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/23] conf: Avoid extra scope when formatting 'smm' feature 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.43]); Wed, 06 Mar 2019 08:21:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use an early break and remove the temporary variable. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1ed889e1d..b42c63fb4d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27814,27 +27814,26 @@ virDomainDefFormatFeatures(virBufferPtr buf, break; case VIR_DOMAIN_FEATURE_SMM: - if (def->features[i] !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virTristateSwitch state =3D def->features[i]; - - virBufferAsprintf(&tmpAttrBuf, " state=3D'%s'", - virTristateSwitchTypeToString(state)); + if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ABSENT) + break; - if (state =3D=3D VIR_TRISTATE_SWITCH_ON && - def->tseg_specified) { - const char *unit; - unsigned long long short_size =3D virFormatIntPretty(d= ef->tseg_size, - &un= it); + virBufferAsprintf(&tmpAttrBuf, " state=3D'%s'", + virTristateSwitchTypeToString(def->features[= i])); - virBufferSetChildIndent(&tmpChildBuf, buf); - virBufferAsprintf(&tmpChildBuf, "%ll= u\n", - unit, short_size); - } + if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && + def->tseg_specified) { + const char *unit; + unsigned long long short_size =3D virFormatIntPretty(def->= tseg_size, + &unit); - if (virXMLFormatElement(buf, "smm", &tmpAttrBuf, &tmpChild= Buf) < 0) - return -1; + virBufferSetChildIndent(&tmpChildBuf, buf); + virBufferAsprintf(&tmpChildBuf, "%llu\n", + unit, short_size); } + if (virXMLFormatElement(buf, "smm", &tmpAttrBuf, &tmpChildBuf)= < 0) + return -1; + break; case VIR_DOMAIN_FEATURE_APIC: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list