From nobody Mon Feb 9 09:32:42 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 1550231799986771.6326494321427; Fri, 15 Feb 2019 03:56:39 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B94E315D3C; Fri, 15 Feb 2019 11:56:37 +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 F0DAB102493E; Fri, 15 Feb 2019 11:56:36 +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 9628E181A12B; Fri, 15 Feb 2019 11:56:36 +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 x1FBu37M004440 for ; Fri, 15 Feb 2019 06:56:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5DFC826FC9; Fri, 15 Feb 2019 11:56:03 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D3E8726FA2 for ; Fri, 15 Feb 2019 11:56:02 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Feb 2019 12:55:52 +0100 Message-Id: <20190215115552.23904-8-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 7/7] conf: Rework virDomainDeviceDefPostParseCommon() 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 15 Feb 2019 11:56:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Now that we've moved all the actual code into helper functions, we can turn it into a switch statement. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 77 +++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7f66fa27ff..ffdc027983 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4966,33 +4966,72 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDe= fPtr dev, unsigned int parseFlags ATTRIBUTE_UNUSED, virDomainXMLOptionPtr xmlopt) { - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR) - return virDomainChrDefPostParse(dev->data.chr, def); + int ret =3D -1; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_RNG) - return virDomainRNGDefPostParse(dev->data.rng); + switch ((virDomainDeviceType)dev->type) { + case VIR_DOMAIN_DEVICE_CHR: + ret =3D virDomainChrDefPostParse(dev->data.chr, def); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK) - return virDomainDiskDefPostParse(dev->data.disk, def, xmlopt); + case VIR_DOMAIN_DEVICE_RNG: + ret =3D virDomainRNGDefPostParse(dev->data.rng); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO) - return virDomainVideoDefPostParse(dev->data.video, def); + case VIR_DOMAIN_DEVICE_DISK: + ret =3D virDomainDiskDefPostParse(dev->data.disk, def, xmlopt); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV && - virDomainHostdevDefPostParse(dev->data.hostdev, def, xmlopt) < 0) - return -1; + case VIR_DOMAIN_DEVICE_VIDEO: + ret =3D virDomainVideoDefPostParse(dev->data.video, def); + break; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + ret =3D virDomainHostdevDefPostParse(dev->data.hostdev, def, xmlop= t); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CONTROLLER) - return virDomainControllerDefPostParse(dev->data.controller); + case VIR_DOMAIN_DEVICE_CONTROLLER: + ret =3D virDomainControllerDefPostParse(dev->data.controller); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET) - return virDomainNetDefPostParse(dev->data.net); + case VIR_DOMAIN_DEVICE_NET: + ret =3D virDomainNetDefPostParse(dev->data.net); + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VSOCK && - virDomainVsockDefPostParse(dev->data.vsock) < 0) - return -1; + case VIR_DOMAIN_DEVICE_VSOCK: + ret =3D virDomainVsockDefPostParse(dev->data.vsock); + break; =20 - return 0; + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_IOMMU: + ret =3D 0; + break; + + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + break; + + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + break; + } + + return ret; } =20 =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list