From nobody Tue Dec 16 08:04:51 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 1503302931542865.1744541042218; Mon, 21 Aug 2017 01:08:51 -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 CFD297E44B; Mon, 21 Aug 2017 08:08:49 +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 AA1D06C523; Mon, 21 Aug 2017 08:08:49 +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 1E7C13FAD5; Mon, 21 Aug 2017 08:07:53 +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 v7L87ZsX002513 for ; Mon, 21 Aug 2017 04:07:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 798736F924; Mon, 21 Aug 2017 08:07:35 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1C416F92D for ; Mon, 21 Aug 2017 08:07:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CFD297E44B 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:14 +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 14/17] conf: assign parsed strings directly into chardev source definition 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:08:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since the source element is parsed only once for these type of character devices we don't have to use temporary variable and check whether the variable was already set. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d69590e29d..84184a265e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11067,10 +11067,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, int nvmSeclabels) { int ret =3D -1; - char *path =3D NULL; - char *channel =3D NULL; - char *master =3D NULL; - char *slave =3D NULL; char *append =3D NULL; bool logParsed =3D false; bool protocolParsed =3D false; @@ -11105,10 +11101,9 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, 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"); + if (def->type !=3D VIR_DOMAIN_CHR_TYPE_PTY || + !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) + def->data.file.path =3D virXMLPropString(cur, "path"); break; =20 case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -11127,15 +11122,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - if (!channel) - channel =3D virXMLPropString(cur, "channel"); + def->data.spiceport.channel =3D virXMLPropString(cur, "cha= nnel"); break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: - if (!master) - master =3D virXMLPropString(cur, "master"); - if (!slave) - slave =3D virXMLPropString(cur, "slave"); + def->data.nmdm.master =3D virXMLPropString(cur, "master"); + def->data.nmdm.slave =3D virXMLPropString(cur, "slave"); break; =20 case VIR_DOMAIN_CHR_TYPE_LAST: @@ -11202,34 +11194,26 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, _("Invalid append attribute value '%s'"), appen= d); goto error; } - if (!path && + if (!def->data.file.path && def->type !=3D VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char devic= e")); goto error; } - - def->data.file.path =3D path; - path =3D NULL; break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: - if (!master) { + if (!def->data.nmdm.master) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing master path attribute for nmdm devic= e")); goto error; } =20 - if (!slave) { + if (!def->data.nmdm.slave) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing slave path attribute for nmdm device= ")); goto error; } - - def->data.nmdm.master =3D master; - def->data.nmdm.slave =3D slave; - master =3D NULL; - slave =3D NULL; break; =20 case VIR_DOMAIN_CHR_TYPE_TCP: @@ -11267,25 +11251,22 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - if (!channel) { + if (!def->data.spiceport.channel) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing source channel attribute for char de= vice")); goto error; } - if (strspn(channel, SERIAL_CHANNEL_NAME_CHARS) < strlen(channel)) { + if (strspn(def->data.spiceport.channel, + SERIAL_CHANNEL_NAME_CHARS) < strlen(def->data.spiceport= .channel)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid character in source channel for char= device")); goto error; } - def->data.spiceport.channel =3D channel; - channel =3D NULL; break; } =20 ret =3D 0; cleanup: - VIR_FREE(path); - VIR_FREE(channel); VIR_FREE(append); =20 return ret; --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list