From nobody Tue Dec 16 08:04:52 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1503302861140865.595873373143; Mon, 21 Aug 2017 01:07:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 686047E42C; Mon, 21 Aug 2017 08:07:39 +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 45CD66C520; Mon, 21 Aug 2017 08:07:39 +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 100033FAD2; Mon, 21 Aug 2017 08:07:39 +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 v7L87QBc002405 for ; Mon, 21 Aug 2017 04:07:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id C38FC6F927; Mon, 21 Aug 2017 08:07:26 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4805D6F926 for ; Mon, 21 Aug 2017 08:07:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 686047E42C Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Aug 2017 10:07:04 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/17] conf: switch from while to for loop for chardev parsing 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 21 Aug 2017 08:07:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This removes one level of indentation. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 168 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3bef5bed3b..ba0241cb21 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10918,100 +10918,100 @@ virDomainChrSourceDefParseXML(virDomainChrSourc= eDefPtr def, char *haveTLS =3D NULL; char *tlsFromConfig =3D NULL; =20 - while (cur !=3D NULL) { - if (cur->type =3D=3D XML_ELEMENT_NODE) { - if (virXMLNodeNameEqual(cur, "source")) { - if (!mode) - mode =3D virXMLPropString(cur, "mode"); - if (!haveTLS) - haveTLS =3D virXMLPropString(cur, "tls"); - if (!tlsFromConfig) - tlsFromConfig =3D virXMLPropString(cur, "tlsFromConfig= "); + for (; cur; cur =3D cur->next) { + if (cur->type !=3D XML_ELEMENT_NODE) + continue; =20 - switch ((virDomainChrType) def->type) { - case VIR_DOMAIN_CHR_TYPE_FILE: - case VIR_DOMAIN_CHR_TYPE_PTY: - case VIR_DOMAIN_CHR_TYPE_DEV: - case VIR_DOMAIN_CHR_TYPE_PIPE: - case VIR_DOMAIN_CHR_TYPE_UNIX: - if (!append && def->type =3D=3D VIR_DOMAIN_CHR_TYPE_FI= LE) - append =3D virXMLPropString(cur, "append"); - /* PTY path is only parsed from live xml. */ - if (!path && - (def->type !=3D VIR_DOMAIN_CHR_TYPE_PTY || - !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))) - path =3D virXMLPropString(cur, "path"); + if (virXMLNodeNameEqual(cur, "source")) { + if (!mode) + mode =3D virXMLPropString(cur, "mode"); + if (!haveTLS) + haveTLS =3D virXMLPropString(cur, "tls"); + if (!tlsFromConfig) + tlsFromConfig =3D virXMLPropString(cur, "tlsFromConfig"); =20 - break; + switch ((virDomainChrType) def->type) { + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_PIPE: + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (!append && def->type =3D=3D VIR_DOMAIN_CHR_TYPE_FILE) + append =3D virXMLPropString(cur, "append"); + /* PTY path is only parsed from live xml. */ + if (!path && + (def->type !=3D VIR_DOMAIN_CHR_TYPE_PTY || + !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))) + path =3D virXMLPropString(cur, "path"); =20 - case VIR_DOMAIN_CHR_TYPE_UDP: - case VIR_DOMAIN_CHR_TYPE_TCP: - if (!mode || STREQ(mode, "connect")) { - if (!connectHost) - connectHost =3D virXMLPropString(cur, "host"); - if (!connectService) - connectService =3D virXMLPropString(cur, "serv= ice"); - } else if (STREQ(mode, "bind")) { - if (!bindHost) - bindHost =3D virXMLPropString(cur, "host"); - if (!bindService) - bindService =3D virXMLPropString(cur, "service= "); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown source mode '%s'"), mode= ); - goto error; - } + break; =20 - if (def->type =3D=3D VIR_DOMAIN_CHR_TYPE_UDP) - VIR_FREE(mode); - break; - - case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - if (!channel) - channel =3D virXMLPropString(cur, "channel"); - break; - - case VIR_DOMAIN_CHR_TYPE_NMDM: - if (!master) - master =3D virXMLPropString(cur, "master"); - if (!slave) - slave =3D virXMLPropString(cur, "slave"); - break; - - case VIR_DOMAIN_CHR_TYPE_LAST: - case VIR_DOMAIN_CHR_TYPE_NULL: - case VIR_DOMAIN_CHR_TYPE_VC: - case VIR_DOMAIN_CHR_TYPE_STDIO: - case VIR_DOMAIN_CHR_TYPE_SPICEVMC: - break; + case VIR_DOMAIN_CHR_TYPE_UDP: + case VIR_DOMAIN_CHR_TYPE_TCP: + if (!mode || STREQ(mode, "connect")) { + if (!connectHost) + connectHost =3D virXMLPropString(cur, "host"); + if (!connectService) + connectService =3D virXMLPropString(cur, "service"= ); + } else if (STREQ(mode, "bind")) { + if (!bindHost) + bindHost =3D virXMLPropString(cur, "host"); + if (!bindService) + bindService =3D virXMLPropString(cur, "service"); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown source mode '%s'"), mode); + goto error; } =20 - /* Check for an optional seclabel override in . */ - if (chr_def) { - xmlNodePtr saved_node =3D ctxt->node; - ctxt->node =3D cur; - if (virSecurityDeviceLabelDefParseXML(&def->seclabels, - &def->nseclabels, - vmSeclabels, - nvmSeclabels, - ctxt, - flags) < 0) { - ctxt->node =3D saved_node; - goto error; - } + if (def->type =3D=3D VIR_DOMAIN_CHR_TYPE_UDP) + VIR_FREE(mode); + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + if (!channel) + channel =3D virXMLPropString(cur, "channel"); + break; + + case VIR_DOMAIN_CHR_TYPE_NMDM: + if (!master) + master =3D virXMLPropString(cur, "master"); + if (!slave) + slave =3D virXMLPropString(cur, "slave"); + break; + + case VIR_DOMAIN_CHR_TYPE_LAST: + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + break; + } + + /* Check for an optional seclabel override in . */ + if (chr_def) { + xmlNodePtr saved_node =3D ctxt->node; + ctxt->node =3D cur; + if (virSecurityDeviceLabelDefParseXML(&def->seclabels, + &def->nseclabels, + vmSeclabels, + nvmSeclabels, + ctxt, + flags) < 0) { ctxt->node =3D saved_node; + goto error; } - } else if (virXMLNodeNameEqual(cur, "log")) { - if (!logfile) - logfile =3D virXMLPropString(cur, "file"); - if (!logappend) - logappend =3D virXMLPropString(cur, "append"); - } else if (virXMLNodeNameEqual(cur, "protocol")) { - if (!protocol) - protocol =3D virXMLPropString(cur, "type"); + ctxt->node =3D saved_node; } + } else if (virXMLNodeNameEqual(cur, "log")) { + if (!logfile) + logfile =3D virXMLPropString(cur, "file"); + if (!logappend) + logappend =3D virXMLPropString(cur, "append"); + } else if (virXMLNodeNameEqual(cur, "protocol")) { + if (!protocol) + protocol =3D virXMLPropString(cur, "type"); } - cur =3D cur->next; } =20 switch ((virDomainChrType) def->type) { --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list