From nobody Tue May 13 20:14:10 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; 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 1530188120344491.54276656768604; Thu, 28 Jun 2018 05:15:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A45E3082155; Thu, 28 Jun 2018 12:15:16 +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 931A0308BDB0; Thu, 28 Jun 2018 12:15:15 +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 A68DE18037F0; Thu, 28 Jun 2018 12:15:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5SCF9Ji011175 for ; Thu, 28 Jun 2018 08:15:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id CA6092026D6C; Thu, 28 Jun 2018 12:15:09 +0000 (UTC) Received: from beluga.usersys.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 510182026D69; Thu, 28 Jun 2018 12:15:09 +0000 (UTC) From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 28 Jun 2018 14:15:00 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH 3/5] conf: Introduce virDomainDefPostParseVideo helper 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 28 Jun 2018 12:15:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the video post parse bits into a separate helper as the logic is going to be extended in the future. Signed-off-by: Erik Skultety Reviewed-by: John Ferlan --- src/conf/domain_conf.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 87dbb9a433..96ab6cf520 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5121,6 +5121,34 @@ virDomainDefBootOrderPostParse(virDomainDefPtr def) } =20 =20 +static int +virDomainDefPostParseVideo(virDomainDefPtr def, + void *opaque) +{ + if (def->nvideos =3D=3D 0) + return 0; + + virDomainDeviceDef device =3D { + .type =3D VIR_DOMAIN_DEVICE_VIDEO, + .data.video =3D def->videos[0], + }; + + /* Mark the first video as primary. If the user specified + * primary=3D"yes", the parser already inserted the device at + * def->videos[0] + */ + def->videos[0]->primary =3D true; + + /* videos[0] might have been added in AddImplicitDevices, after we've + * done the per-device post-parse */ + if (virDomainDefPostParseDeviceIterator(def, &device, + NULL, opaque) < 0) + return -1; + + return 0; +} + + static int virDomainDefPostParseCommon(virDomainDefPtr def, struct virDomainDefPostParseDeviceIteratorData= *data) @@ -5157,21 +5185,8 @@ virDomainDefPostParseCommon(virDomainDefPtr def, if (virDomainDefAddImplicitDevices(def) < 0) return -1; =20 - if (def->nvideos !=3D 0) { - virDomainDeviceDef device =3D { - .type =3D VIR_DOMAIN_DEVICE_VIDEO, - .data.video =3D def->videos[0], - }; - - /* Mark the first video as primary. If the user specified primary= =3D"yes", - * the parser already inserted the device at def->videos[0] */ - def->videos[0]->primary =3D true; - - /* videos[0] might have been added in AddImplicitDevices, after we= 've - * done the per-device post-parse */ - if (virDomainDefPostParseDeviceIterator(def, &device, NULL, data) = < 0) - return -1; - } + if (virDomainDefPostParseVideo(def, data) < 0) + return -1; =20 if (def->nserials !=3D 0) { virDomainDeviceDef device =3D { --=20 2.14.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list