From nobody Sun Feb 8 20:53:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565951986; cv=none; d=zoho.com; s=zohoarc; b=eFpkVcTWQUW5kpOSnbz/ONj4MtvsoLsTD1sv1B5agERC5GvdXsPUfsKge3cI/0YNyXk6B5+GiG/0XU+6W+sNHdUuxUhcVGduGJTAAPiouUzJVTRapBf8ZFvw+esxj7c1/CmjfJPngW/3PpPhqp0kSFywnIpXY4ubzldmRwW6bPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565951986; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9kUGxcvxh0AnUfb8B/ExBT84j7vyhF87i+ILiacdJOY=; b=citiTC6xFg9oVym8gGJ/J55wfgHpHjlATCTpOo4c/AIGjZyGylI8XesJVfQgWzn+DSusOv+LDmWH/tLA31V+VHsUGyfRZkSQYb6nD1TOOsFY2mBCZGoDb1ChmLZAxkEBhHlTs0zCkwX2J3Hs1f/SBcRbiL2QPQmZr5fi2MXLI94= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565951986447278.512380174089; Fri, 16 Aug 2019 03:39:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1996C308212F; Fri, 16 Aug 2019 10:39:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B54867DA35; Fri, 16 Aug 2019 10:39:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D8EF180BA9A; Fri, 16 Aug 2019 10:39:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7GAdg3B021506 for ; Fri, 16 Aug 2019 06:39:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id D36F19654D; Fri, 16 Aug 2019 10:39:42 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EEBFA4F9A for ; Fri, 16 Aug 2019 10:39:42 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 16 Aug 2019 12:39:23 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/14] util: storagefile: Remove cleanup label from virStorageSourceParseBackingJSONiSCSI X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 16 Aug 2019 10:39:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" There is no cleanup code. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virstoragefile.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 520f531088..8af45bfbd2 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -3263,7 +3263,6 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourc= ePtr src, const char *lun =3D virJSONValueObjectGetStringOrNumber(json, "lun"); const char *uri; char *port; - int ret =3D -1; /* legacy URI based syntax passed via 'filename' option */ if ((uri =3D virJSONValueObjectGetString(json, "filename"))) @@ -3277,14 +3276,14 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSou= rcePtr src, lun =3D "0"; if (VIR_ALLOC(src->hosts) < 0) - goto cleanup; + return -1; src->nhosts =3D 1; if (STRNEQ_NULLABLE(transport, "tcp")) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("only TCP transport is supported for iSCSI volume= s")); - goto cleanup; + return -1; } src->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; @@ -3292,33 +3291,30 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSou= rcePtr src, if (!portal) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("missing 'portal' address in iSCSI backing defini= tion")); - goto cleanup; + return -1; } if (!target) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("missing 'target' in iSCSI backing definition")); - goto cleanup; + return -1; } if (VIR_STRDUP(src->hosts->name, portal) < 0) - goto cleanup; + return -1; if ((port =3D strrchr(src->hosts->name, ':')) && !strchr(port, ']')) { if (virStringParsePort(port + 1, &src->hosts->port) < 0) - goto cleanup; + return -1; *port =3D '\0'; } if (virAsprintf(&src->path, "%s/%s", target, lun) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list