From nobody Mon Feb 9 12:25:37 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550231766675462.80296631799706; Fri, 15 Feb 2019 03:56:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 32F1FA3034; Fri, 15 Feb 2019 11:56:04 +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 4B1495D6A9; Fri, 15 Feb 2019 11:56:03 +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 6C12D3D39D; Fri, 15 Feb 2019 11:55:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1FBtw6G004386 for ; Fri, 15 Feb 2019 06:55:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6696B26E59; Fri, 15 Feb 2019 11:55:58 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0CA626E71 for ; Fri, 15 Feb 2019 11:55:57 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Feb 2019 12:55:46 +0100 Message-Id: <20190215115552.23904-2-abologna@redhat.com> In-Reply-To: <20190215115552.23904-1-abologna@redhat.com> References: <20190215115552.23904-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/7] conf: Introduce virDomainChrDefPostParse() 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: , 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 15 Feb 2019 11:56:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Minor tweaks to ensure compliance with our coding style. Signed-off-by: Andrea Bolognani --- src/conf/domain_conf.c | 59 ++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5d49f4388c..74bb18d726 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4810,6 +4810,38 @@ virDomainCheckVirtioOptions(virDomainVirtioOptionsPt= r virtio) } =20 =20 +static int +virDomainChrDefPostParse(virDomainChrDefPtr chr, + const virDomainDef *def) +{ + const virDomainChrDef **arrPtr; + size_t i, cnt; + + virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt); + + if (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && + chr->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) { + chr->targetType =3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; + } + + if (chr->target.port =3D=3D -1 && + (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL || + chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL || + chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)) { + int maxport =3D -1; + + for (i =3D 0; i < cnt; i++) { + if (arrPtr[i]->target.port > maxport) + maxport =3D arrPtr[i]->target.port; + } + + chr->target.port =3D maxport + 1; + } + + return 0; +} + + static int virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) { @@ -4831,31 +4863,8 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDef= Ptr dev, unsigned int parseFlags ATTRIBUTE_UNUSED, virDomainXMLOptionPtr xmlopt) { - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR) { - virDomainChrDefPtr chr =3D dev->data.chr; - const virDomainChrDef **arrPtr; - size_t i, cnt; - - virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt); - - if (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - chr->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) - chr->targetType =3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; - - if (chr->target.port =3D=3D -1 && - (chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL || - chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL || - chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)) { - int maxport =3D -1; - - for (i =3D 0; i < cnt; i++) { - if (arrPtr[i]->target.port > maxport) - maxport =3D arrPtr[i]->target.port; - } - - chr->target.port =3D maxport + 1; - } - } + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR) + return virDomainChrDefPostParse(dev->data.chr, def); =20 /* set default path for virtio-rng "random" backend to /dev/random */ if (dev->type =3D=3D VIR_DOMAIN_DEVICE_RNG && --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list