From nobody Tue Dec 16 08:36:46 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 1503302906158130.24057078751582; Mon, 21 Aug 2017 01:08:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7ABEB83F3D; Mon, 21 Aug 2017 08:08:24 +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 5385B6F926; Mon, 21 Aug 2017 08:08:22 +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 929C936FB; Mon, 21 Aug 2017 08:07:50 +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 v7L87Y9m002501 for ; Mon, 21 Aug 2017 04:07:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 97F526F927; Mon, 21 Aug 2017 08:07:34 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D9F46F924 for ; Mon, 21 Aug 2017 08:07:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7ABEB83F3D 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:13 +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 13/17] conf: move UNIX chardev source 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.11 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:24 +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 | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d8a195a141..d69590e29d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10989,6 +10989,23 @@ virDomainChrSourceDefParseUDP(virDomainChrSourceDe= fPtr def, =20 =20 static int +virDomainChrSourceDefParseUnix(virDomainChrSourceDefPtr def, + xmlNodePtr source) +{ + + int mode; + + if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) + return -1; + + def->data.nix.listen =3D mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND; + def->data.nix.path =3D virXMLPropString(source, "path"); + + return 0; +} + + +static int virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def, xmlNodePtr protocol) { @@ -11050,7 +11067,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, int nvmSeclabels) { int ret =3D -1; - int mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; char *path =3D NULL; char *channel =3D NULL; char *master =3D NULL; @@ -11086,7 +11102,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, 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. */ @@ -11094,11 +11109,11 @@ 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; - } + break; =20 + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (virDomainChrSourceDefParseUnix(def, cur) < 0) + goto error; break; =20 case VIR_DOMAIN_CHR_TYPE_UDP: @@ -11241,7 +11256,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, =20 case VIR_DOMAIN_CHR_TYPE_UNIX: /* path can be auto generated */ - if (!path && + if (!def->data.nix.path && (!chr_def || (chr_def->targetType !=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_= XEN && chr_def->targetType !=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_= VIRTIO))) { @@ -11249,11 +11264,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, _("Missing source path attribute for char devic= e")); goto error; } - - def->data.nix.listen =3D mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BI= ND; - - def->data.nix.path =3D path; - path =3D NULL; break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list