From nobody Sat May 18 06:50:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709048048; cv=none; d=zohomail.com; s=zohoarc; b=PJtHf0khWCuexvAaJW4/vHHKRa96CEm8KIAF0f9/UlQkHuh4iEP/ozWoEc0KC61uFrnMyIYn8r9eMyoSk8ZM0dyjwhZnvDJU4+wksc1cX8V4EpkvnVWuByhZF1kz9n+B2WuE0zmrvnY6xaBGG6ULU2XF1aDyLo2ARfe+iTTC20w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709048048; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FzgwhyokEddU/xOGRdNHlwa1e7L1HMr+WMvWHC+6R8E=; b=gLpEq+wlPEDQuUn2zFI+nMms2L6bscvK6KkHe0IbAqimJL1aeEm5lS7aiADsEFPE8+w2VPk7ntfrwCwrOjLdzH52qQEhIbHVjWfasQCUP7u95tHjnMA8tFDRbfenYBRP3jlGNcC4nRFhzo1TwlvxFFDUvnqiiXNuGss722rw4us= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709048048675914.600355022776; Tue, 27 Feb 2024 07:34:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rezSl-0004QB-MY; Tue, 27 Feb 2024 10:33:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSb-0004IV-Ip for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSU-0005Hb-LE for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:37 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-bSXZ2bBsOzyzdg3XLPX4Qw-1; Tue, 27 Feb 2024 10:33:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EF5E3810786; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AAC92166B33; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F3B8E21E66FB; Tue, 27 Feb 2024 16:33:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709048008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FzgwhyokEddU/xOGRdNHlwa1e7L1HMr+WMvWHC+6R8E=; b=jDSROBd6CnhwHVndpgm0jIBI9suFQVLb6DCvTwz7Lh42FeO+weYRySo71FbOVFA7tnUbfE PCUUMcRegVtAFmlTi7makmk5EsLnjosDNTzmBxkr1UftHyEWqTunWY3cWU4VDR3jH03iby R/IfxPcCFKDNKgQFf27wo1UBHQZ02BY= X-MC-Unique: bSXZ2bBsOzyzdg3XLPX4Qw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: steven.sistare@oracle.com, philmd@linaro.org, dave@treblig.org, jasowang@redhat.com, michael.roth@amd.com, peterx@redhat.com, farosas@suse.de, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v7 1/3] qapi: New QAPI_LIST_LENGTH() Date: Tue, 27 Feb 2024 16:33:19 +0100 Message-ID: <20240227153321.467343-2-armbru@redhat.com> In-Reply-To: <20240227153321.467343-1-armbru@redhat.com> References: <20240227153321.467343-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709048050638100007 From: Steve Sistare Signed-off-by: Steve Sistare Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qapi/util.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/qapi/util.h b/include/qapi/util.h index 81a2b13a33..20dfea8a54 100644 --- a/include/qapi/util.h +++ b/include/qapi/util.h @@ -56,4 +56,17 @@ int parse_qapi_name(const char *name, bool complete); (tail) =3D &(*(tail))->next; \ } while (0) =20 +/* + * For any GenericList @list, return its length. + */ +#define QAPI_LIST_LENGTH(list) \ + ({ \ + size_t _len =3D 0; \ + typeof(list) _tail; \ + for (_tail =3D list; _tail !=3D NULL; _tail =3D _tail->next) { \ + _len++; \ + } \ + _len; \ + }) + #endif --=20 2.43.0 From nobody Sat May 18 06:50:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709048039; cv=none; d=zohomail.com; s=zohoarc; b=bbrgnpKA4pPmBb/JvTJRvF4PeCu4PFpFt13j7OFTZlRWRf08imtxWVKJeXBFNvcWyQIqjEgwBDOWlzGXHUb714EhMQNjyYD+hODGjHtyBwp7BAC6rKEF9fj7OvMFYcac2mXhbUG6NIC30L+ns5rq80M6HbFaVRZ0YdSn1vWn4sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709048039; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w97dCBrvpjqTDvUM76J/eMQk/Qlr2Rs024e5lcrEDOk=; b=MopPfdaz4NoAfsfGxET5nlN5sP9eFf+WiWsbOg0cSAQ4x0m0OlhyMHPxe7pJSZRcbd52cvNjtR6y+S6Y7NA+PH89MnZ8/AA/ujmvaMK9EgK+79DhIZ6NRBNngfhnJUnbXkbFKwCA6cL+k8mq1P9w19BrS0WlNZe6mycqxwlRDn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709048039045954.2817630928268; Tue, 27 Feb 2024 07:33:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rezSk-0004Oj-U4; Tue, 27 Feb 2024 10:33:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSb-0004IU-Ch for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSU-0005HU-Ka for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:37 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-urU1QP7AM8uBba1tM5y-2g-1; Tue, 27 Feb 2024 10:33:23 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DE743C2E0A0; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09A6A20229A7; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0363F21E6682; Tue, 27 Feb 2024 16:33:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709048007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w97dCBrvpjqTDvUM76J/eMQk/Qlr2Rs024e5lcrEDOk=; b=f4G+iZzbK+Fhv28ohjec+KqScXSDEwzBQVPatdf0KksLm/8wcQQICulV9QGiPnFnmayrUW c2Bq8akefCmubxjYHTDnFwSOXN4dEzFBHmbUC6+ZTuzXKE0iT5nTopjdepJ1gNnjtLtAhZ bTn14DfsJyjLG9fNidm9WzUMIVc30HU= X-MC-Unique: urU1QP7AM8uBba1tM5y-2g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: steven.sistare@oracle.com, philmd@linaro.org, dave@treblig.org, jasowang@redhat.com, michael.roth@amd.com, peterx@redhat.com, farosas@suse.de, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v7 2/3] qapi: New strv_from_str_list() Date: Tue, 27 Feb 2024 16:33:20 +0100 Message-ID: <20240227153321.467343-3-armbru@redhat.com> In-Reply-To: <20240227153321.467343-1-armbru@redhat.com> References: <20240227153321.467343-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709048040658100001 From: Steve Sistare Signed-off-by: Steve Sistare Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qapi/type-helpers.h | 8 ++++++++ qapi/qapi-type-helpers.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/qapi/type-helpers.h b/include/qapi/type-helpers.h index be1f181526..fc8352cdec 100644 --- a/include/qapi/type-helpers.h +++ b/include/qapi/type-helpers.h @@ -12,3 +12,11 @@ #include "qapi/qapi-types-common.h" =20 HumanReadableText *human_readable_text_from_str(GString *str); + +/* + * Produce and return a NULL-terminated array of strings from @list. + * The result is g_malloc()'d and all strings are g_strdup()'d. It + * can be freed with g_strfreev(), or by g_auto(GStrv) automatic + * cleanup. + */ +char **strv_from_str_list(const strList *list); diff --git a/qapi/qapi-type-helpers.c b/qapi/qapi-type-helpers.c index f76b34f647..266da013ad 100644 --- a/qapi/qapi-type-helpers.c +++ b/qapi/qapi-type-helpers.c @@ -21,3 +21,17 @@ HumanReadableText *human_readable_text_from_str(GString = *str) =20 return ret; } + +char **strv_from_str_list(const strList *list) +{ + const strList *tail; + int i =3D 0; + char **strv =3D g_new(char *, QAPI_LIST_LENGTH(list) + 1); + + for (tail =3D list; tail !=3D NULL; tail =3D tail->next) { + strv[i++] =3D g_strdup(tail->value); + } + strv[i] =3D NULL; + + return strv; +} --=20 2.43.0 From nobody Sat May 18 06:50:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709048070; cv=none; d=zohomail.com; s=zohoarc; b=fsxw4XWQklgdOA28/U6tqVkeWKPJ2jq2b8AN5Y/WlHTXrZvDxkOCiiGQbNqCqH8UxKiySAR8N9R5MskTALSEso/1eCjPfUimM7M0mhNXXgErqEr5PJbv6+NmrwybiaKLrcxbjxH/H77avG+haw4jKfu7k4zFeGJltz7kBX5E1NU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709048070; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4ygEJha1k0iwErA+UUXIpGWsdgck9M5i+PDDxNYeDpU=; b=Ne6NPb0ARoQOjcSOPaV1oVfc/5azpYd6E9RF75wEwJm9eHcdROEwvF6dVqU03JQux8j2Ao7/7ZJdWUP6T+hTwh52ElqA/YnP7j8G3CqfNNdJ8LhGLU5g7jekqNn+dkz2aU2Rcr62aiAaIX3Aze3D9X/Z2yQc0E9Gz92ZlAzN7L8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709048069990654.4621140763877; Tue, 27 Feb 2024 07:34:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rezSl-0004Pm-Cg; Tue, 27 Feb 2024 10:33:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSa-0004IR-V5 for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezSR-0005HO-Qw for qemu-devel@nongnu.org; Tue, 27 Feb 2024 10:33:36 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-Y-xZB9KsNhSqfO3bWPKF0Q-1; Tue, 27 Feb 2024 10:33:23 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2E335881B6F; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0974620229A4; Tue, 27 Feb 2024 15:33:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0707C21E6691; Tue, 27 Feb 2024 16:33:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709048007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ygEJha1k0iwErA+UUXIpGWsdgck9M5i+PDDxNYeDpU=; b=ZQ4p2C7gE00pvFj+gcfrAz9MtkjKSD65dmx/ZXwg2RgMpNsBFEZlgZ9xNSARlOGrCEMTe/ 7YuK1TvgLUUvqGSOn5rC10ruEpX5kz5LW78bfK8fqrhBOtSdNLFRRvMOebG2n/7TokwoUP /KF/y885iAMq+gQtxMDWp0NxX1JffHM= X-MC-Unique: Y-xZB9KsNhSqfO3bWPKF0Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: steven.sistare@oracle.com, philmd@linaro.org, dave@treblig.org, jasowang@redhat.com, michael.roth@amd.com, peterx@redhat.com, farosas@suse.de Subject: [PATCH v7 3/3] migration: simplify exec migration functions Date: Tue, 27 Feb 2024 16:33:21 +0100 Message-ID: <20240227153321.467343-4-armbru@redhat.com> In-Reply-To: <20240227153321.467343-1-armbru@redhat.com> References: <20240227153321.467343-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709048070710100001 Content-Type: text/plain; charset="utf-8" From: Steve Sistare Simplify the exec migration code by using list utility functions. As a side effect, this also fixes a minor memory leak. On function return, "g_auto(GStrv) argv" frees argv and each element, which is wrong, because the function does not own the individual elements. To compensate, the code uses g_steal_pointer which NULLs argv and prevents the destructor from running, but argv is leaked. Fixes: cbab4face57b ("migration: convert exec backend ...") Signed-off-by: Steve Sistare Reviewed-by: Fabiano Rosas --- migration/exec.c | 57 +++++++----------------------------------------- 1 file changed, 8 insertions(+), 49 deletions(-) diff --git a/migration/exec.c b/migration/exec.c index 47d2f3b8fb..20e6cccf8c 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/type-helpers.h" #include "qemu/error-report.h" #include "channel.h" #include "exec.h" @@ -39,51 +40,16 @@ const char *exec_get_cmd_path(void) } #endif =20 -/* provides the length of strList */ -static int -str_list_length(strList *list) -{ - int len =3D 0; - strList *elem; - - for (elem =3D list; elem !=3D NULL; elem =3D elem->next) { - len++; - } - - return len; -} - -static void -init_exec_array(strList *command, char **argv, Error **errp) -{ - int i =3D 0; - strList *lst; - - for (lst =3D command; lst; lst =3D lst->next) { - argv[i++] =3D lst->value; - } - - argv[i] =3D NULL; - return; -} - void exec_start_outgoing_migration(MigrationState *s, strList *command, Error **errp) { - QIOChannel *ioc; - - int length =3D str_list_length(command); - g_auto(GStrv) argv =3D (char **) g_new0(const char *, length + 1); - - init_exec_array(command, argv, errp); + QIOChannel *ioc =3D NULL; + g_auto(GStrv) argv =3D strv_from_str_list(command); + const char * const *args =3D (const char * const *) argv; g_autofree char *new_command =3D g_strjoinv(" ", (char **)argv); =20 trace_migration_exec_outgoing(new_command); - ioc =3D QIO_CHANNEL( - qio_channel_command_new_spawn( - (const char * const *) g_steal_pointer(&argv), - O_RDWR, - errp)); + ioc =3D QIO_CHANNEL(qio_channel_command_new_spawn(args, O_RDWR, errp)); if (!ioc) { return; } @@ -105,19 +71,12 @@ static gboolean exec_accept_incoming_migration(QIOChan= nel *ioc, void exec_start_incoming_migration(strList *command, Error **errp) { QIOChannel *ioc; - - int length =3D str_list_length(command); - g_auto(GStrv) argv =3D (char **) g_new0(const char *, length + 1); - - init_exec_array(command, argv, errp); + g_auto(GStrv) argv =3D strv_from_str_list(command); + const char * const *args =3D (const char * const *) argv; g_autofree char *new_command =3D g_strjoinv(" ", (char **)argv); =20 trace_migration_exec_incoming(new_command); - ioc =3D QIO_CHANNEL( - qio_channel_command_new_spawn( - (const char * const *) g_steal_pointer(&argv), - O_RDWR, - errp)); + ioc =3D QIO_CHANNEL(qio_channel_command_new_spawn(args, O_RDWR, errp)); if (!ioc) { return; } --=20 2.43.0