External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: Convert virDomainDiskDef's 'model' to virDomainDiskModel

Browse Source 
Use the appropriate type for the variable and refactor the XML parser to
parse it correctly using virXMLPropEnum.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-16 10:46:00 +02:00
parent e3434446c5
commit 21c10943a9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -9345,13 +9345,9 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt,
} }
VIR_FREE(tmp); VIR_FREE(tmp);
if ((tmp = virXMLPropString(node, "model")) && if (virXMLPropEnum(node, "model", virDomainDiskModelTypeFromString,
(def->model = virDomainDiskModelTypeFromString(tmp)) < 0) { VIR_XML_PROP_OPTIONAL, &def->model) < 0)
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk model '%s'"), tmp);
return NULL; return NULL;
}
VIR_FREE(tmp);
snapshot = virXMLPropString(node, "snapshot"); snapshot = virXMLPropString(node, "snapshot");

2
src/conf/domain_conf.h
View File

@ -584,7 +584,7 @@ struct _virDomainDiskDef {
int detect_zeroes; /* enum virDomainDiskDetectZeroes */ int detect_zeroes; /* enum virDomainDiskDetectZeroes */
char *domain_name; /* backend domain name */ char *domain_name; /* backend domain name */
unsigned int queues; unsigned int queues;
int model; /* enum virDomainDiskModel */ virDomainDiskModel model;
virDomainVirtioOptions *virtio; virDomainVirtioOptions *virtio;
bool diskElementAuth; bool diskElementAuth;