External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: disk: Remove custom single-use temporary variables

Browse Source 
Use a single temporary variable instead shortening the code.
This commit is contained in:
Peter Krempa 2016-04-20 16:16:22 +02:00
parent ffaacefada
commit 5211c90738
1 changed files with 50 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/conf/domain_conf.c
View File

@ -6920,110 +6920,84 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
xmlNodePtr cur) xmlNodePtr cur)
{ {
char *tmp = NULL; char *tmp = NULL;
char *cachetag = NULL;
char *error_policy = NULL;
char *rerror_policy = NULL;
char *iotag = NULL;
char *ioeventfd = NULL;
char *event_idx = NULL;
char *copy_on_read = NULL;
char *discard = NULL;
char *driverIOThread = NULL;
int ret = -1; int ret = -1;
def->src->driverName = virXMLPropString(cur, "name"); def->src->driverName = virXMLPropString(cur, "name");
cachetag = virXMLPropString(cur, "cache");
error_policy = virXMLPropString(cur, "error_policy");
rerror_policy = virXMLPropString(cur, "rerror_policy");
iotag = virXMLPropString(cur, "io");
ioeventfd = virXMLPropString(cur, "ioeventfd");
event_idx = virXMLPropString(cur, "event_idx");
copy_on_read = virXMLPropString(cur, "copy_on_read");
discard = virXMLPropString(cur, "discard");
driverIOThread = virXMLPropString(cur, "iothread");
if (cachetag && if ((tmp = virXMLPropString(cur, "cache")) &&
(def->cachemode = virDomainDiskCacheTypeFromString(cachetag)) < 0) { (def->cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk cache mode '%s'"), cachetag); _("unknown disk cache mode '%s'"), tmp);
goto cleanup; goto cleanup;
} }
VIR_FREE(tmp);
if (error_policy && if ((tmp = virXMLPropString(cur, "error_policy")) &&
(def->error_policy = virDomainDiskErrorPolicyTypeFromString(error_policy)) <= 0) { (def->error_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk error policy '%s'"), error_policy); _("unknown disk error policy '%s'"), tmp);
goto cleanup; goto cleanup;
} }
VIR_FREE(tmp);
if (rerror_policy && if ((tmp = virXMLPropString(cur, "rerror_policy")) &&
(((def->rerror_policy (((def->rerror_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) ||
= virDomainDiskErrorPolicyTypeFromString(rerror_policy)) <= 0) ||
(def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE))) { (def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk read error policy '%s'"), _("unknown disk read error policy '%s'"), tmp);
rerror_policy);
goto cleanup; goto cleanup;
} }
VIR_FREE(tmp);
if (iotag) { if ((tmp = virXMLPropString(cur, "io")) &&
if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) <= 0) { (def->iomode = virDomainDiskIoTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk io mode '%s'"), iotag); _("unknown disk io mode '%s'"), tmp);
goto cleanup; goto cleanup;
}
} }
VIR_FREE(tmp);
if (ioeventfd) { if ((tmp = virXMLPropString(cur, "ioeventfd")) &&
int val; (def->ioeventfd = virTristateSwitchTypeFromString(tmp)) <= 0) {
if ((val = virTristateSwitchTypeFromString(ioeventfd)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk ioeventfd mode '%s'"), tmp);
_("unknown disk ioeventfd mode '%s'"), goto cleanup;
ioeventfd);
goto cleanup;
}
def->ioeventfd = val;
} }
VIR_FREE(tmp);
if (event_idx) { if ((tmp = virXMLPropString(cur, "event_idx")) &&
int idx; (def->event_idx = virTristateSwitchTypeFromString(tmp)) <= 0) {
if ((idx = virTristateSwitchTypeFromString(event_idx)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk event_idx mode '%s'"), tmp);
_("unknown disk event_idx mode '%s'"), goto cleanup;
event_idx);
goto cleanup;
}
def->event_idx = idx;
} }
VIR_FREE(tmp);
if (copy_on_read) { if ((tmp = virXMLPropString(cur, "copy_on_read")) &&
int cor; (def->copy_on_read = virTristateSwitchTypeFromString(tmp)) <= 0) {
if ((cor = virTristateSwitchTypeFromString(copy_on_read)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk copy_on_read mode '%s'"), tmp);
_("unknown disk copy_on_read mode '%s'"), goto cleanup;
copy_on_read);
goto cleanup;
}
def->copy_on_read = cor;
} }
VIR_FREE(tmp);
if (discard) { if ((tmp = virXMLPropString(cur, "discard")) &&
if ((def->discard = virDomainDiskDiscardTypeFromString(discard)) <= 0) { (def->discard = virDomainDiskDiscardTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk discard mode '%s'"), discard); _("unknown disk discard mode '%s'"), tmp);
goto cleanup; goto cleanup;
}
} }
VIR_FREE(tmp);
if (driverIOThread) { if ((tmp = virXMLPropString(cur, "iothread")) &&
if (virStrToLong_uip(driverIOThread, NULL, 10, &def->iothread) < 0 || (virStrToLong_uip(tmp, NULL, 10, &def->iothread) < 0 ||
def->iothread == 0) { def->iothread == 0)) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("Invalid iothread attribute in disk driver " _("Invalid iothread attribute in disk driver element: %s"),
"element: %s"), driverIOThread); tmp);
goto cleanup; goto cleanup;
}
} }
VIR_FREE(tmp);
if ((tmp = virXMLPropString(cur, "type"))) { if ((tmp = virXMLPropString(cur, "type"))) {
if (STREQ(tmp, "aio")) { if (STREQ(tmp, "aio")) {
@ -7044,15 +7018,6 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
cleanup: cleanup:
VIR_FREE(tmp); VIR_FREE(tmp);
VIR_FREE(cachetag);
VIR_FREE(error_policy);
VIR_FREE(rerror_policy);
VIR_FREE(iotag);
VIR_FREE(ioeventfd);
VIR_FREE(event_idx);
VIR_FREE(copy_on_read);
VIR_FREE(discard);
VIR_FREE(driverIOThread);
return ret; return ret;
} }