From nobody Sun Feb 8 21:33:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642771992; cv=none; d=zohomail.com; s=zohoarc; b=dFjNfiDSv6SW3GKXE4yZXKFqU/KfCGNhFk8qfmMKcH/5FjYyE/lSW1oUj5ka/7JlHitTUxl1qL1ebxk1RdsC6sQCFZXol3/bPOdLH1poXUpQ5eJdJRmz6Qp5QaVP2Hp5HZCHY6UWr3Fy+LmXcL/9qJhFnEycq4PPyoWA+jw/T94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642771992; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NHscJV2RkAnT/lS/yHjr4tOwVvkJTliYFwbyWPJ1KR0=; b=ek9Kuw2WySldu8iyE0DrJr5Qya6r+xp0FK9d0p4U7Kvibq6HoW4Jcmnt4GY0nKPytWPUo+sF2YBO6cvGMbMW8GSolkQQcZIg8+5YVQhRbRxIWb6oVkwIXeFY3wn4zAGvdtnbM22Z/sqgQl1T7Vi3RFesnl1IDyReq3lgaCnJj+c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642771992217276.5150398107471; Fri, 21 Jan 2022 05:33:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-627-SZODWiqDNyKJrVmbMnqlCA-1; Fri, 21 Jan 2022 08:33:07 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B75978144E2; Fri, 21 Jan 2022 13:32:58 +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 960917E11E; Fri, 21 Jan 2022 13:32:58 +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 5F14F4A7CA; Fri, 21 Jan 2022 13:32:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20LDSYCq012024 for ; Fri, 21 Jan 2022 08:28:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id ADFD3108F850; Fri, 21 Jan 2022 13:28:34 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38C1610A4023 for ; Fri, 21 Jan 2022 13:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642771990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NHscJV2RkAnT/lS/yHjr4tOwVvkJTliYFwbyWPJ1KR0=; b=XH6DcX+dqYper393/1kMBNfA/hXjj30vMsyygDelKn1ZzxLw43rL27mJN50A6xJi9odROm GnLiGQY5NIgxIbAeGgS5wHNjJ3ZoxyHbWViCjDgwU1oAHAitD7dtB9q19/yBujJ40D8uPC 0gN6hR9IuhWt2/X7ChseMAiuBkerT0g= X-MC-Unique: SZODWiqDNyKJrVmbMnqlCA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 12/12] conf: Convert virDomainHostdevDefParseXMLSubsys() to virXMLProp*() Date: Fri, 21 Jan 2022 14:28:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642771994233100001 Content-Type: text/plain; charset="utf-8" After previous cleanups, the virDomainHostdevDefParseXMLSubsys() function uses a mixture of virXMLProp*() and the old virXMLPropString() + virXXXTypeFromString() patterns. Rework it so that virXMLProp*() is used. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 60 ++++++++++++----------------------- src/conf/domain_conf.h | 26 +++++++-------- src/qemu/qemu_command.c | 4 +-- src/qemu/qemu_hostdev.c | 4 +-- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_validate.c | 2 +- src/security/virt-aa-helper.c | 2 +- 7 files changed, 42 insertions(+), 59 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a25beaee3e..f97bd7bf22 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7293,14 +7293,12 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, virDomainXMLOption *xmlopt) { xmlNodePtr sourcenode; - int backend; + xmlNodePtr driver_node =3D NULL; virDomainHostdevSubsysPCI *pcisrc =3D &def->source.subsys.u.pci; virDomainHostdevSubsysSCSI *scsisrc =3D &def->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *scsihostsrc =3D &def->source.subsys.u= .scsi_host; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &def->source.subsys.u.m= dev; virTristateBool managed; - g_autofree char *sgio =3D NULL; - g_autofree char *backendStr =3D NULL; g_autofree char *model =3D NULL; int rv; =20 @@ -7313,7 +7311,6 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONE, &managed)); virTristateBoolToBool(managed, &def->managed); =20 - sgio =3D virXMLPropString(node, "sgio"); model =3D virXMLPropString(node, "model"); =20 /* @type is passed in from the caller rather than read from the @@ -7352,18 +7349,17 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, return -1; } =20 - if (sgio) { + if ((rv =3D virXMLPropEnum(node, "sgio", + virDomainDeviceSGIOTypeFromString, + VIR_XML_PROP_NONZERO, + &scsisrc->sgio)) < 0) { + return -1; + } else if (rv > 0) { if (def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SC= SI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sgio is only supported for scsi host device"= )); return -1; } - - if ((scsisrc->sgio =3D virDomainDeviceSGIOTypeFromString(sgio)) <= =3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown sgio mode '%s'"), sgio); - return -1; - } } =20 if ((rv =3D virXMLPropTristateBool(node, "rawio", @@ -7389,27 +7385,17 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, } =20 if (def->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI= _HOST) { - if (model && - ((scsihostsrc->model =3D virDomainHostdevSubsysSCSIVHostModelT= ypeFromString(model)) < 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown hostdev model '%s'"), - model); + if (virXMLPropEnum(node, "model", + virDomainHostdevSubsysSCSIVHostModelTypeFromStr= ing, + VIR_XML_PROP_NONE, + &scsihostsrc->model) < 0) return -1; - } } else if (def->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TY= PE_MDEV) { - if (!model) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Missing 'model' attribute in mediated device= 's " - " element")); + if (virXMLPropEnum(node, "model", + virMediatedDeviceModelTypeFromString, + VIR_XML_PROP_REQUIRED, + &mdevsrc->model) < 0) return -1; - } - - if ((mdevsrc->model =3D virMediatedDeviceModelTypeFromString(model= )) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown hostdev model '%s'"), - model); - return -1; - } =20 if (virXMLPropTristateSwitch(node, "display", VIR_XML_PROP_NONE, @@ -7427,16 +7413,12 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if (virDomainHostdevSubsysPCIDefParseXML(sourcenode, ctxt, def, fl= ags) < 0) return -1; =20 - backend =3D VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT; - if ((backendStr =3D virXPathString("string(./driver/@name)", ctxt)= ) && - (((backend =3D virDomainHostdevSubsysPCIBackendTypeFromString(= backendStr)) < 0) || - backend =3D=3D VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown PCI device " - "has been specified"), backendStr); + driver_node =3D virXPathNode("./driver", ctxt); + if (virXMLPropEnum(driver_node, "name", + virDomainHostdevSubsysPCIBackendTypeFromString, + VIR_XML_PROP_NONZERO, + &pcisrc->backend) < 0) return -1; - } - pcisrc->backend =3D backend; =20 break; =20 @@ -30564,7 +30546,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *do= m, } port->plug.hostdevpci.managed =3D virTristateBoolFromBool(actual->= data.hostdev.def.managed); port->plug.hostdevpci.addr =3D actual->data.hostdev.def.source.sub= sys.u.pci.addr; - switch ((virDomainHostdevSubsysPCIBackendType)actual->data.hostdev= .def.source.subsys.u.pci.backend) { + switch (actual->data.hostdev.def.source.subsys.u.pci.backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: port->plug.hostdevpci.driver =3D VIR_NETWORK_FORWARD_DRIVER_NA= ME_DEFAULT; break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a4d7b6f99..3e63d2513b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -214,7 +214,7 @@ typedef enum { =20 /* the backend driver used for PCI hostdev devices */ typedef enum { - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, /* detect automatically, prefe= r VFIO */ + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT =3D 0, /* detect automatically,= prefer VFIO */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM, /* force legacy kvm style */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO, /* force vfio */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN, /* force legacy xen style, use = pciback */ @@ -245,7 +245,7 @@ struct _virDomainHostdevSubsysUSB { =20 struct _virDomainHostdevSubsysPCI { virPCIDeviceAddress addr; /* host address */ - int backend; /* enum virDomainHostdevSubsysPCIBackendType */ + virDomainHostdevSubsysPCIBackendType backend; }; =20 struct _virDomainHostdevSubsysSCSIHost { @@ -260,9 +260,17 @@ struct _virDomainHostdevSubsysSCSIiSCSI { virStorageSource *src; }; =20 +typedef enum { + VIR_DOMAIN_DEVICE_SGIO_DEFAULT =3D 0, + VIR_DOMAIN_DEVICE_SGIO_FILTERED, + VIR_DOMAIN_DEVICE_SGIO_UNFILTERED, + + VIR_DOMAIN_DEVICE_SGIO_LAST +} virDomainDeviceSGIO; + struct _virDomainHostdevSubsysSCSI { int protocol; /* enum virDomainHostdevSCSIProtocolType */ - int sgio; /* enum virDomainDeviceSGIO */ + virDomainDeviceSGIO sgio; virTristateBool rawio; union { virDomainHostdevSubsysSCSIHost host; @@ -271,7 +279,7 @@ struct _virDomainHostdevSubsysSCSI { }; =20 struct _virDomainHostdevSubsysMediatedDev { - int model; /* enum virMediatedDeviceModelType= */ + virMediatedDeviceModelType model; virTristateSwitch display; char uuidstr[VIR_UUID_STRING_BUFLEN]; /* mediated device's uuid stri= ng */ virTristateSwitch ramfb; @@ -300,7 +308,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsysSCSIVHostModel); struct _virDomainHostdevSubsysSCSIVHost { int protocol; /* enum virDomainHostdevSubsysSCSIHostProtocolType */ char *wwpn; - int model; /* enum virDomainHostdevSubsysSCSIVHostModelType */ + virDomainHostdevSubsysSCSIVHostModelType model; }; =20 struct _virDomainHostdevSubsys { @@ -449,14 +457,6 @@ typedef enum { VIR_DOMAIN_DISK_IO_LAST } virDomainDiskIo; =20 -typedef enum { - VIR_DOMAIN_DEVICE_SGIO_DEFAULT =3D 0, - VIR_DOMAIN_DEVICE_SGIO_FILTERED, - VIR_DOMAIN_DEVICE_SGIO_UNFILTERED, - - VIR_DOMAIN_DEVICE_SGIO_LAST -} virDomainDeviceSGIO; - typedef enum { VIR_DOMAIN_DISK_DISCARD_DEFAULT =3D 0, VIR_DOMAIN_DISK_DISCARD_UNMAP, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 99ac44d7f1..f5d7cd2c1b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4967,7 +4967,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, const char *failover_pair_id =3D NULL; =20 /* caller has to assign proper passthrough backend type */ - switch ((virDomainHostdevSubsysPCIBackendType) pcisrc->backend) { + switch (pcisrc->backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: break; =20 @@ -5480,7 +5480,7 @@ qemuBuildHostdevCommandLine(virCommand *cmd, =20 /* MDEV */ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: - switch ((virMediatedDeviceModelType) mdevsrc->model) { + switch (mdevsrc->model) { case VIR_MDEV_MODEL_TYPE_VFIO_PCI: case VIR_MDEV_MODEL_TYPE_VFIO_CCW: case VIR_MDEV_MODEL_TYPE_VFIO_AP: diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index dfe657c51e..8af22bdd58 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -169,14 +169,14 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHos= tdevDef **hostdevs, /* assign defaults for hostdev passthrough */ for (i =3D 0; i < nhostdevs; i++) { virDomainHostdevDef *hostdev =3D hostdevs[i]; - int *backend =3D &hostdev->source.subsys.u.pci.backend; + virDomainHostdevSubsysPCIBackendType *backend =3D &hostdev->source= .subsys.u.pci.backend; =20 if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) continue; if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP= E_PCI) continue; =20 - switch ((virDomainHostdevSubsysPCIBackendType)*backend) { + switch (*backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: if (supportsPassthroughVFIO && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f3ec24635d..22acbd0852 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1622,7 +1622,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, /* this could have been changed by qemuHostdevPreparePCIDevices */ backend =3D hostdev->source.subsys.u.pci.backend; =20 - switch ((virDomainHostdevSubsysPCIBackendType)backend) { + switch (backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2814,6 +2814,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; } break; + case VIR_MDEV_MODEL_TYPE_VFIO_AP: case VIR_MDEV_MODEL_TYPE_LAST: break; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7eaad3614e..0a879f0115 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2357,7 +2357,7 @@ qemuValidateDomainMdevDef(const virDomainHostdevDef *= hostdev, const virDomainHostdevSubsysMediatedDev *mdevsrc; =20 mdevsrc =3D &hostdev->source.subsys.u.mdev; - switch ((virMediatedDeviceModelType) mdevsrc->model) { + switch (mdevsrc->model) { case VIR_MDEV_MODEL_TYPE_VFIO_PCI: return qemuValidateDomainMdevDefVFIOPCI(hostdev, def, qemuCaps); case VIR_MDEV_MODEL_TYPE_VFIO_AP: diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 28717b7e38..1f1cce8b3d 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1070,7 +1070,7 @@ get_files(vahControl * ctl) =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: { virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->sourc= e.subsys.u.mdev; - switch ((virMediatedDeviceModelType) mdevsrc->model) { + switch (mdevsrc->model) { case VIR_MDEV_MODEL_TYPE_VFIO_PCI: case VIR_MDEV_MODEL_TYPE_VFIO_AP: case VIR_MDEV_MODEL_TYPE_VFIO_CCW: --=20 2.34.1