External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStorageAdapterParseXML: Use virXMLProp*

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-05-19 16:10:11 +02:00 committed by Michal Privoznik
parent 058d4ed47e
commit 99037fb2b9
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/conf/storage_adapter_conf.c
View File

@ -170,18 +170,16 @@ virStorageAdapterParseXML(virStorageAdapter *adapter,
{ {
int type; int type;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *adapter_type = NULL;
ctxt->node = node; ctxt->node = node;
if ((adapter_type = virXMLPropString(node, "type"))) { if ((type = virXMLPropEnum(node, "type",
if ((type = virStorageAdapterTypeFromString(adapter_type)) <= 0) { virStorageAdapterTypeFromString,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, VIR_XML_PROP_NONZERO, &adapter->type)) < 0)
_("Unknown pool adapter type '%s'"),
adapter_type);
return -1; return -1;
}
adapter->type = type; if (type == 0)
return virStorageAdapterParseXMLLegacy(node, ctxt, adapter);
if ((adapter->type == VIR_STORAGE_ADAPTER_TYPE_FC_HOST) && if ((adapter->type == VIR_STORAGE_ADAPTER_TYPE_FC_HOST) &&
(virStorageAdapterParseXMLFCHost(node, &adapter->data.fchost)) < 0) (virStorageAdapterParseXMLFCHost(node, &adapter->data.fchost)) < 0)
@ -191,10 +189,6 @@ virStorageAdapterParseXML(virStorageAdapter *adapter,
(virStorageAdapterParseXMLSCSIHost(node, ctxt, (virStorageAdapterParseXMLSCSIHost(node, ctxt,
&adapter->data.scsi_host)) < 0) &adapter->data.scsi_host)) < 0)
return -1; return -1;
} else {
if (virStorageAdapterParseXMLLegacy(node, ctxt, adapter) < 0)
return -1;
}
return 0; return 0;
} }