External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNodeDevCapMdevParseXML: Use virXMLPropEnum() for ./start/@type

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2021-05-20 12:51:57 +02:00
parent 7eb281f91c
commit 9d4cd1d1cd
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/node_device_conf.c
View File

@ -1919,7 +1919,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt,
g_autofree xmlNodePtr *attrs = NULL; g_autofree xmlNodePtr *attrs = NULL;
size_t i; size_t i;
g_autofree char *uuidstr = NULL; g_autofree char *uuidstr = NULL;
g_autofree char *starttype = NULL; xmlNodePtr startNode = NULL;
ctxt->node = node; ctxt->node = node;
@ -1941,17 +1941,15 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt,
virUUIDFormat(uuidbuf, mdev->uuid); virUUIDFormat(uuidbuf, mdev->uuid);
} }
if ((starttype = virXPathString("string(./start[1]/@type)", ctxt))) {
int tmp;
if ((tmp = virNodeDevMdevStartTypeFromString(starttype)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mdev start type '%s' for '%s'"), starttype, def->name);
return -1;
}
mdev->start = tmp;
} else {
mdev->start = VIR_NODE_DEV_MDEV_START_MANUAL; mdev->start = VIR_NODE_DEV_MDEV_START_MANUAL;
startNode = virXPathNode("./start[1]", ctxt);
if (startNode &&
virXMLPropEnumDefault(startNode, "type",
virNodeDevMdevStartTypeFromString,
VIR_XML_PROP_NONE, &mdev->start,
VIR_NODE_DEV_MDEV_START_MANUAL) < 0) {
return -1;
} }
/* 'iommuGroup' is optional, only report an error if the supplied value is /* 'iommuGroup' is optional, only report an error if the supplied value is