External/libvirt
1
0
Fork 0
Code

virDomainDiskDefDriverParseXML: Use virXMLProp*

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-22 12:32:54 +02:00 committed by Michal Privoznik
parent eec82ea2d9
commit 45abc1a5db
1 changed files with 46 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/conf/domain_conf.c
View File

@ -8964,109 +8964,51 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
def->driverName = virXMLPropString(cur, "name"); def->driverName = virXMLPropString(cur, "name");
if ((tmp = virXMLPropString(cur, "cache"))) { if (virXMLPropEnum(cur, "cache", virDomainDiskCacheTypeFromString,
int cachemode; VIR_XML_PROP_NONE, &def->cachemode) < 0)
return -1;
if ((cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) { if (virXMLPropEnum(cur, "error_policy",
virDomainDiskErrorPolicyTypeFromString,
VIR_XML_PROP_NONZERO, &def->error_policy) < 0)
return -1;
if (virXMLPropEnum(cur, "rerror_policy",
virDomainDiskErrorPolicyTypeFromString,
VIR_XML_PROP_NONZERO, &def->rerror_policy) < 0)
return -1;
if (def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk cache mode '%s'"), tmp); _("Invalid disk read error policy: '%s'"),
virDomainDiskErrorPolicyTypeToString(def->rerror_policy));
return -1; return -1;
} }
def->cachemode = cachemode;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "error_policy"))) { if (virXMLPropEnum(cur, "io", virDomainDiskIoTypeFromString,
int error_policy; VIR_XML_PROP_NONZERO, &def->iomode) < 0)
if ((error_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk error policy '%s'"), tmp);
return -1; return -1;
}
def->error_policy = error_policy;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "rerror_policy"))) { if (virXMLPropTristateSwitch(cur, "ioeventfd", VIR_XML_PROP_NONE,
int rerror_policy; &def->ioeventfd) < 0)
if (((rerror_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) ||
(rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk read error policy '%s'"), tmp);
return -1; return -1;
}
def->rerror_policy = rerror_policy;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "io"))) { if (virXMLPropTristateSwitch(cur, "event_idx", VIR_XML_PROP_NONE,
int iomode; &def->event_idx) < 0)
if ((iomode = virDomainDiskIoTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk io mode '%s'"), tmp);
return -1; return -1;
}
def->iomode = iomode;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "ioeventfd"))) { if (virXMLPropTristateSwitch(cur, "copy_on_read", VIR_XML_PROP_NONE,
int value; &def->copy_on_read) < 0)
if ((value = virTristateSwitchTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk ioeventfd mode '%s'"), tmp);
return -1; return -1;
}
def->ioeventfd = value;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "event_idx"))) { if (virXMLPropEnum(cur, "discard", virDomainDiskDiscardTypeFromString,
int value; VIR_XML_PROP_NONZERO, &def->discard) < 0)
if ((value = virTristateSwitchTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk event_idx mode '%s'"), tmp);
return -1; return -1;
}
def->event_idx = value;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "copy_on_read"))) { if (virXMLPropUInt(cur, "iothread", 10,
int value; VIR_XML_PROP_NONE | VIR_XML_PROP_NONZERO,
if ((value = virTristateSwitchTypeFromString(tmp)) <= 0) { &def->iothread) < 0)
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk copy_on_read mode '%s'"), tmp);
return -1; return -1;
}
def->copy_on_read = value;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "discard"))) {
int discard;
if ((discard = virDomainDiskDiscardTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk discard mode '%s'"), tmp);
return -1;
}
def->discard = discard;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "iothread")) &&
(virStrToLong_uip(tmp, NULL, 10, &def->iothread) < 0 ||
def->iothread == 0)) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid iothread attribute in disk driver element: %s"),
tmp);
return -1;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "type"))) { if ((tmp = virXMLPropString(cur, "type"))) {
if (STREQ(tmp, "aio")) { if (STREQ(tmp, "aio")) {
@ -9079,29 +9021,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
return -1; return -1;
} }
} }
VIR_FREE(tmp);
} }
if ((tmp = virXMLPropString(cur, "detect_zeroes"))) { if (virXMLPropEnum(cur, "detect_zeroes",
int detect_zeroes; virDomainDiskDetectZeroesTypeFromString,
VIR_XML_PROP_NONZERO, &def->detect_zeroes) < 0)
if ((detect_zeroes = virDomainDiskDetectZeroesTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown driver detect_zeroes value '%s'"), tmp);
return -1; return -1;
}
def->detect_zeroes = detect_zeroes;
}
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "queues")) && if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues) < 0)
virStrToLong_uip(tmp, NULL, 10, &def->queues) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("'queues' attribute must be positive number: %s"),
tmp);
return -1; return -1;
}
if (virParseScaledValue("./metadata_cache/max_size", NULL, if (virParseScaledValue("./metadata_cache/max_size", NULL,
ctxt, ctxt,