[PATCH 3/9] virDomainDiskAddISCSIPoolSourceHost: Remove 'cleanup' label
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/domain_conf.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7cf555596f..1c52d7f347 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -31326,7 +31326,6 @@ static int
virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
virStoragePoolDefPtr pooldef)
{
- int ret = -1;
VIR_AUTOSTRINGLIST tokens = NULL;
size_t ntokens;
@@ -31334,7 +31333,7 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
if (pooldef->source.nhost != 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Expected exactly 1 host for the storage pool"));
- goto cleanup;
+ return -1;
}
/* iscsi pool only supports one host */
@@ -31348,13 +31347,13 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
/* iscsi volume has name like "unit:0:0:1" */
if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":",
0, &ntokens)))
- goto cleanup;
+ return -1;
if (ntokens != 4) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected iscsi volume name '%s'"),
def->src->srcpool->volume);
- goto cleanup;
+ return -1;
}
/* iscsi pool has only one source device path */
@@ -31369,10 +31368,7 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
--
2.24.1