From nobody Tue Dec 16 08:04:20 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 1503302867704580.1652304618034; Mon, 21 Aug 2017 01:07:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06AFA3B721; Mon, 21 Aug 2017 08:07:46 +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 D5B127E2FA; Mon, 21 Aug 2017 08:07:45 +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 9DB40180610B; Mon, 21 Aug 2017 08:07:45 +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 v7L87Vnu002453 for ; Mon, 21 Aug 2017 04:07:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1343F6F930; Mon, 21 Aug 2017 08:07:31 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F0D86F92F for ; Mon, 21 Aug 2017 08:07:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 06AFA3B721 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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:09 +0200 Message-Id: <3d1164d7d0e34a25f41e2223b35d98080496b716.1503302799.git.phrdina@redhat.com> 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 09/17] conf: move chardev log parsing to separate function 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 21 Aug 2017 08:07:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8fe79f70bf..eb576b90ae 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10909,6 +10909,28 @@ virDomainChrSourceDefParseProtocol(virDomainChrSou= rceDefPtr def, } =20 =20 +static int +virDomainChrSourceDefParseLog(virDomainChrSourceDefPtr def, + xmlNodePtr log) +{ + char *append =3D NULL; + + def->logfile =3D virXMLPropString(log, "file"); + + if ((append =3D virXMLPropString(log, "append")) && + (def->logappend =3D virTristateSwitchTypeFromString(append)) <=3D = 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid append attribute value '%s'"), + append); + VIR_FREE(append); + return -1; + } + + VIR_FREE(append); + return 0; +} + + #define SERIAL_CHANNEL_NAME_CHARS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-." =20 @@ -10931,8 +10953,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, char *connectHost =3D NULL; char *connectService =3D NULL; char *path =3D NULL; - char *logfile =3D NULL; - char *logappend =3D NULL; char *mode =3D NULL; char *channel =3D NULL; char *master =3D NULL; @@ -11053,8 +11073,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, goto error; } logParsed =3D true; - logfile =3D virXMLPropString(cur, "file"); - logappend =3D virXMLPropString(cur, "append"); + if (virDomainChrSourceDefParseLog(def, cur) < 0) + goto error; } else if (virXMLNodeNameEqual(cur, "protocol")) { if (protocolParsed) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -11228,16 +11248,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, break; } =20 - def->logfile =3D logfile; - logfile =3D NULL; - - if (logappend !=3D NULL && - (def->logappend =3D virTristateSwitchTypeFromString(logappend)) <= =3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), logappend= ); - goto error; - } - ret =3D 0; cleanup: VIR_FREE(mode); @@ -11248,8 +11258,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, VIR_FREE(path); VIR_FREE(channel); VIR_FREE(append); - VIR_FREE(logappend); - VIR_FREE(logfile); VIR_FREE(haveTLS); VIR_FREE(tlsFromConfig); =20 --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list