From nobody Tue Dec 16 08:36:05 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 1503302868547815.5521706971285; Mon, 21 Aug 2017 01:07:48 -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 D7A2B7E43D; 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 B374E7E2FA; Mon, 21 Aug 2017 08:07:46 +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 6F765185735D; Mon, 21 Aug 2017 08:07:46 +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 v7L87WlP002462 for ; Mon, 21 Aug 2017 04:07:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2389A6F924; Mon, 21 Aug 2017 08:07:32 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95B536F926 for ; Mon, 21 Aug 2017 08:07:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D7A2B7E43D 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:10 +0200 Message-Id: <91c30bbad83abaaed608b365cd90f3b7d2c6640e.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 10/17] conf: move mode parsing of chardev source 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.27]); Mon, 21 Aug 2017 08:07:47 +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 | 60 +++++++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eb576b90ae..e0045eba19 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10886,6 +10886,39 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr d= ef, } =20 =20 +typedef enum { + VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT, + VIR_DOMAIN_CHR_SOURCE_MODE_BIND, +} virDomainChrSourceModeType; + + +/** + * virDomainChrSourceDefParseMode: + * @source: XML dom node + * + * Returns: -1 in case of error, + * virDomainChrSourceModeType in case of success + */ +static int +virDomainChrSourceDefParseMode(xmlNodePtr source) +{ + char *mode =3D virXMLPropString(source, "mode"); + int ret =3D -1; + + if (!mode || STREQ(mode, "connect")) { + ret =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; + } else if (STREQ(mode, "bind")) { + ret =3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown source mode '%s'"), mode); + } + + VIR_FREE(mode); + return ret; +} + + static int virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def, xmlNodePtr protocol) @@ -10948,12 +10981,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, int nvmSeclabels) { int ret =3D -1; + int mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; char *bindHost =3D NULL; char *bindService =3D NULL; char *connectHost =3D NULL; char *connectService =3D NULL; char *path =3D NULL; - char *mode =3D NULL; char *channel =3D NULL; char *master =3D NULL; char *slave =3D NULL; @@ -10985,8 +11018,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, } sourceParsed++; =20 - if (!mode) - mode =3D virXMLPropString(cur, "mode"); if (!haveTLS) haveTLS =3D virXMLPropString(cur, "tls"); if (!tlsFromConfig) @@ -11005,29 +11036,29 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, (def->type !=3D VIR_DOMAIN_CHR_TYPE_PTY || !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))) path =3D virXMLPropString(cur, "path"); + if (def->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX) { + if ((mode =3D virDomainChrSourceDefParseMode(cur)) < 0) + goto error; + } =20 break; =20 case VIR_DOMAIN_CHR_TYPE_UDP: case VIR_DOMAIN_CHR_TYPE_TCP: - if (!mode || STREQ(mode, "connect")) { + if ((mode =3D virDomainChrSourceDefParseMode(cur)) < 0) + goto error; + if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT) { if (!connectHost) connectHost =3D virXMLPropString(cur, "host"); if (!connectService) connectService =3D virXMLPropString(cur, "service"= ); - } else if (STREQ(mode, "bind")) { + } else if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_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 - if (def->type =3D=3D VIR_DOMAIN_CHR_TYPE_UDP) - VIR_FREE(mode); break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: @@ -11137,7 +11168,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, break; =20 case VIR_DOMAIN_CHR_TYPE_TCP: - if (!mode || STREQ(mode, "connect")) { + if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT) { if (!connectHost) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source host attribute for char d= evice")); @@ -11155,7 +11186,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, def->data.tcp.service =3D connectService; connectService =3D NULL; def->data.tcp.listen =3D false; - } else { + } else if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND) { if (!bindHost) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source host attribute for char d= evice")); @@ -11226,7 +11257,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, goto error; } =20 - def->data.nix.listen =3D mode !=3D NULL && STRNEQ(mode, "connect"); + def->data.nix.listen =3D mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BI= ND; =20 def->data.nix.path =3D path; path =3D NULL; @@ -11250,7 +11281,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, =20 ret =3D 0; cleanup: - VIR_FREE(mode); VIR_FREE(bindHost); VIR_FREE(bindService); VIR_FREE(connectHost); --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list