From nobody Sun Feb 8 19:56:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1624021525; cv=none; d=zohomail.com; s=zohoarc; b=abEAl5cvJm+IlKBvOBJm35y/4JkQrLVxi+BdxK+7rG3/jdCl+Bwi5YkV+p1AKiV93HBzMcxnbTNCmt6CdOlulMrQ/+oiRPQua8f3PvFCOzbuIPyd6PTepH467YIFBaoYlt6z1xZ8+KPHnjigK+0Dn0wkOr188NtLelWw7zlD9UI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624021525; 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; bh=NxoGp5oE3UAMmdABjV0wR7uRzZtUYDA2mu46XZOYklA=; b=IdYjOKyYVmee4AWrMfndDfJvHZWVX2o53wKHf6kEX1sHD20D8JpDuruTq0Z2VOIQvnwqoZHKy6EyDNzRYYWKj7QFf09wp1zzp7fsqXu8Odcp3aYXdJaGL7MKwALwF8OkA93Zo2Jc6B2QzneWSiu7VcgyjJjsy8YIXDUjdLYd82w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1624021525357796.9339017266602; Fri, 18 Jun 2021 06:05:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-Pi2tqFagNZi8ujF1216gPw-1; Fri, 18 Jun 2021 09:05:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C30321084F42; Fri, 18 Jun 2021 13:05:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A4401036D04; Fri, 18 Jun 2021 13:05:16 +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 43CE046F5E; Fri, 18 Jun 2021 13:05:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ID4vS8032743 for ; Fri, 18 Jun 2021 09:04:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8BE305C233; Fri, 18 Jun 2021 13:04:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF49E5C224 for ; Fri, 18 Jun 2021 13:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624021524; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NxoGp5oE3UAMmdABjV0wR7uRzZtUYDA2mu46XZOYklA=; b=d2MUET9a6Q+/6MnxiyqXqfzwSMuTKtwXUURpNNmw/C2Y82bbcAd0cuSKPU2ENOO5U0nW3w A2ARIj8BKqTWn5kEDUSyChUf5rUkHVZwal/guQiMravi76sltFLEwbPwdCrZlyLDCh9xGj gwUt0B9Fvl8hmbfDFjTnGGVhIVWM4Jo= X-MC-Unique: Pi2tqFagNZi8ujF1216gPw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] virISCSIDirectUpdateTargets: Rework to simplify cleanup and return GStrv Date: Fri, 18 Jun 2021 15:04:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Count the elements in advance rather than using VIR_APPEND_ELEMENT and ensure that there's a NULL terminator for the string list so it's GStrv compatible. Signed-off-by: Peter Krempa --- src/storage/storage_backend_iscsi_direct.c | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/stora= ge_backend_iscsi_direct.c index 263db835ae..2073a6df38 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -420,37 +420,30 @@ virISCSIDirectUpdateTargets(struct iscsi_context *isc= si, size_t *ntargets, char ***targets) { - int ret =3D -1; struct iscsi_discovery_address *addr; struct iscsi_discovery_address *tmp_addr; - size_t tmp_ntargets =3D 0; - char **tmp_targets =3D NULL; + + *ntargets =3D 0; if (!(addr =3D iscsi_discovery_sync(iscsi))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to discover session: %s"), iscsi_get_error(iscsi)); - return ret; + return -1; } - for (tmp_addr =3D addr; tmp_addr; tmp_addr =3D tmp_addr->next) { - g_autofree char *target =3D NULL; - - target =3D g_strdup(tmp_addr->target_name); + for (tmp_addr =3D addr; tmp_addr; tmp_addr =3D tmp_addr->next) + (*ntargets)++; - if (VIR_APPEND_ELEMENT(tmp_targets, tmp_ntargets, target) < 0) - goto cleanup; - } + *targets =3D g_new0(char *, ntargets + 1); + *ntargets =3D 0; - *targets =3D g_steal_pointer(&tmp_targets); - *ntargets =3D tmp_ntargets; - tmp_ntargets =3D 0; + for (tmp_addr =3D addr; tmp_addr; tmp_addr =3D tmp_addr->next) + *targets[(*ntargets)++] =3D g_strdup(tmp_addr->target_name); - ret =3D 0; - cleanup: iscsi_free_discovery_data(iscsi, addr); - virStringListFreeCount(tmp_targets, tmp_ntargets); - return ret; + + return 0; } static int --=20 2.31.1