From nobody Tue Nov 26 08:53:08 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1708638559; cv=none; d=zohomail.com; s=zohoarc; b=m5YOhIg9y9CmsSQxbXb2u8uLdffrEPQEyP4oMM5CR4u0XiAltbFdGgdAHgS/GhQFM8qpiKgdRpuPqnYXdM4LWSqZji5LDONwR//+aOSsMmDgPUgc4ILudQatsqALZv43Yzu3tIbPiK42/2yWR/T9kvUo2zcqI7bD8ff+jCPCJpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708638559; h=Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BIi1WtitC+J7SybPA2RWPAxfHOWovnHuzo9XahJQZs0=; b=jqLxgvZcMoxuZ+YaCMe9i4nwYV6AlvOGTqeh544A6VZCZWLXzXtqRBQvmnxg2NxTU/OkYPUYgyEXfwedB0+Ros0LOZ88W1I8kSKskvwMx2yrrVjUmq8Pl76cYf0WrdXXcu6xinqTE6GZJc8J9JcxjK1G9lHtouMHcB60TzkSao4= 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 1708638559536536.5645130007568; Thu, 22 Feb 2024 13:49:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdGve-0000tN-6M; Thu, 22 Feb 2024 16:48:33 -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 1rdGvO-0000om-Po for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:16 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdGvC-0005Pd-4P for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:14 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41MIYNwo031415; Thu, 22 Feb 2024 21:47:56 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wakd2e3gx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:55 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41MKxcK2022224; Thu, 22 Feb 2024 21:47:54 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8bft59-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:54 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41MLlqU9037274; Thu, 22 Feb 2024 21:47:53 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3wak8bft40-2; Thu, 22 Feb 2024 21:47:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=BIi1WtitC+J7SybPA2RWPAxfHOWovnHuzo9XahJQZs0=; b=TTNWqd5SkFmpqUOtc70W3TIR/bbttGbb9ogP2mP18KxKkWM4KJzW6s/yp4sI/RJBs9hr kynNzXuaO8gGVVwCepSlhI5Q5Ih64ghJEIGdhdzZx0UGQyQNActh3lsCofszwDm5l5UW vxRUMH56MHZmsKMxfTwg7acElLaMwYHMTPS2zpF/7f/JoJfWzkeh9OkNmaXV+QeHs+GN RUvWjdQ6AEHcqGcMSZoJ4WpyzZitHZBV4NsiJYW880cvAoanc4JBJS/Fh9YAV2u06NS+ VQdXyLpprxflgowwOVbYU3GilNXYgYHiCfIg/hvKZ8qSSWybhG08Ntc7XDvv9tG/JlzY kw== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Steve Sistare Subject: [PATCH V5 1/5] util: str_split Date: Thu, 22 Feb 2024 13:47:46 -0800 Message-Id: <1708638470-114846-2-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> References: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220169 X-Proofpoint-GUID: wuj5JlvKSUJ995151oU9_mV0j2p279Xr X-Proofpoint-ORIG-GUID: wuj5JlvKSUJ995151oU9_mV0j2p279Xr 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=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @oracle.com) X-ZM-MESSAGEID: 1708638560000100002 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Generalize hmp_split_at_comma() to take any delimiter string, rename as str_split(), and move it to util/strList.c. No functional change. Signed-off-by: Steve Sistare Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/monitor/hmp.h | 1 - include/qemu/strList.h | 24 ++++++++++++++++++++++++ monitor/hmp-cmds.c | 19 ------------------- net/net-hmp-cmds.c | 3 ++- stats/stats-hmp-cmds.c | 3 ++- util/meson.build | 1 + util/strList.c | 24 ++++++++++++++++++++++++ 7 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 include/qemu/strList.h create mode 100644 util/strList.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 13f9a2d..2df661e 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -19,7 +19,6 @@ =20 bool hmp_handle_error(Monitor *mon, Error *err); void hmp_help_cmd(Monitor *mon, const char *name); -strList *hmp_split_at_comma(const char *str); =20 void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); diff --git a/include/qemu/strList.h b/include/qemu/strList.h new file mode 100644 index 0000000..0f26116 --- /dev/null +++ b/include/qemu/strList.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2022 - 2024 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_STR_LIST_H +#define QEMU_STR_LIST_H + +#include "qapi/qapi-builtin-types.h" + +/* + * Split @str into a strList using the delimiter string @delim. + * The delimiter is not included in the result. + * Return NULL if @str is NULL or an empty string. + * A leading, trailing, or consecutive delimiter produces an + * empty string at that position in the output. + * All strings are g_strdup'd, and the result can be freed + * using qapi_free_strList. + */ +strList *str_split(const char *str, const char *delim); + +#endif diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 871898a..66b68a0 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -38,25 +38,6 @@ bool hmp_handle_error(Monitor *mon, Error *err) return false; } =20 -/* - * Split @str at comma. - * A null @str defaults to "". - */ -strList *hmp_split_at_comma(const char *str) -{ - char **split =3D g_strsplit(str ?: "", ",", -1); - strList *res =3D NULL; - strList **tail =3D &res; - int i; - - for (i =3D 0; split[i]; i++) { - QAPI_LIST_APPEND(tail, split[i]); - } - - g_free(split); - return res; -} - void hmp_info_name(Monitor *mon, const QDict *qdict) { NameInfo *info; diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c index 41d326b..969cdd1 100644 --- a/net/net-hmp-cmds.c +++ b/net/net-hmp-cmds.c @@ -26,6 +26,7 @@ #include "qemu/config-file.h" #include "qemu/help_option.h" #include "qemu/option.h" +#include "qemu/strList.h" =20 void hmp_info_network(Monitor *mon, const QDict *qdict) { @@ -72,7 +73,7 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict) migrate_announce_params()); =20 qapi_free_strList(params->interfaces); - params->interfaces =3D hmp_split_at_comma(interfaces_str); + params->interfaces =3D str_split(interfaces_str, ","); params->has_interfaces =3D params->interfaces !=3D NULL; params->id =3D g_strdup(id); qmp_announce_self(params, NULL); diff --git a/stats/stats-hmp-cmds.c b/stats/stats-hmp-cmds.c index 1f91bf8..62db8c6 100644 --- a/stats/stats-hmp-cmds.c +++ b/stats/stats-hmp-cmds.c @@ -10,6 +10,7 @@ #include "monitor/hmp.h" #include "monitor/monitor.h" #include "qemu/cutils.h" +#include "qemu/strList.h" #include "hw/core/cpu.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" @@ -176,7 +177,7 @@ static StatsFilter *stats_filter(StatsTarget target, co= nst char *names, request->provider =3D provider_idx; if (names && !g_str_equal(names, "*")) { request->has_names =3D true; - request->names =3D hmp_split_at_comma(names); + request->names =3D str_split(names, ","); } QAPI_LIST_PREPEND(request_list, request); } diff --git a/util/meson.build b/util/meson.build index 0ef9886..bd125a4 100644 --- a/util/meson.build +++ b/util/meson.build @@ -1,4 +1,5 @@ util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c= ')) +util_ss.add(files('strList.c')) util_ss.add(files('thread-context.c'), numa) if not config_host_data.get('CONFIG_ATOMIC64') util_ss.add(files('atomic64.c')) diff --git a/util/strList.c b/util/strList.c new file mode 100644 index 0000000..7588c7c --- /dev/null +++ b/util/strList.c @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2023 Red Hat, Inc. + * Copyright (c) 2022 - 2024 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/strList.h" + +strList *str_split(const char *str, const char *delim) +{ + g_autofree char **split =3D g_strsplit(str ?: "", delim, -1); + strList *res =3D NULL; + strList **tail =3D &res; + int i; + + for (i =3D 0; split[i]; i++) { + QAPI_LIST_APPEND(tail, split[i]); + } + + return res; +} --=20 1.8.3.1 From nobody Tue Nov 26 08:53:08 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1708638544; cv=none; d=zohomail.com; s=zohoarc; b=YKJI6zKQHhmNL9bjXQb8Aj8BSoHohHh9HvJdzj5uYj4VB3uf7Y7RvfcMLyboYvCKk2lfUkVo4TP8F5koNn7bI1t/8HcTuroMv4xUp0yp/tUDDpN/ufcuw/5PslqkqoJI5NX77o7escKoIl62tlpxgPGzbwTo88b6/IgAaENKIgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708638544; 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=o3oit5ldE+NEebjJz1DchaFQnOU35e+LSkFNo6mVBPU=; b=liQ8cM5lytSYhjL6BTH71vggUT05Kr5WszjYIxymFV5ZjiGJ/Kzry/9/AZXgw+KboJo4eMsrtCU0xadeDPW4z/wbP5aKMl/PBBHWZlefLumGIaKTRtOtEWIskK6b0ndt2ZsLuuBwYntAbt48Pg0hzMpEljT8PxuzJpBY8vrbQqQ= 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 1708638544989134.34547137572997; Thu, 22 Feb 2024 13:49:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdGvY-0000sG-6k; Thu, 22 Feb 2024 16:48:25 -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 1rdGvS-0000pO-QJ for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:18 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdGvC-0005Pi-3m for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:18 -0500 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41MIQUN6013885; Thu, 22 Feb 2024 21:47:57 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wd5fw5p90-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:57 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41ML0sjr022159; Thu, 22 Feb 2024 21:47:55 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8bft5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:55 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41MLlqUB037274; Thu, 22 Feb 2024 21:47:54 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3wak8bft40-3; Thu, 22 Feb 2024 21:47:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2023-11-20; bh=o3oit5ldE+NEebjJz1DchaFQnOU35e+LSkFNo6mVBPU=; b=X0SVoJnYYWxVBMuTp4PXohluaVe36tflPFOVkVHILggXYK/ckFRQypx/ujKS+g3sFJlQ L7VrXB10hGEYz0sy9dYwbi0Q+oeKhYlN0ISosAfPj+91CqB0LEDgCigfV2AuOY6Fu9DK vf9juhcQoClrRXjyzjT6ImBPTqRhv14oTMEBJGahgLGk072ZEXP0/qXqgb92BhHObaP/ IG/W/krzjeDoS7qzUklarwsi4ARaXLFlPLPGq8JiKrUF1L4OPr94h6GBMkDahbm4SWBV HHsHS6PbaVfATXdUTwSEPbs9ZDzTXWb9lU/q94CJoBzDQbMW7dh6beejec55LcJC7npU CA== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Steve Sistare Subject: [PATCH V5 2/5] qapi: QAPI_LIST_LENGTH Date: Thu, 22 Feb 2024 13:47:47 -0800 Message-Id: <1708638470-114846-3-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> References: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220169 X-Proofpoint-GUID: 4rlASmzXpofMvPcSiSOOKtS46YwxjMij X-Proofpoint-ORIG-GUID: 4rlASmzXpofMvPcSiSOOKtS46YwxjMij 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=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @oracle.com) X-ZM-MESSAGEID: 1708638546068100001 Signed-off-by: Steve Sistare Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qapi/util.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/qapi/util.h b/include/qapi/util.h index 81a2b13..20dfea8 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 1.8.3.1 From nobody Tue Nov 26 08:53:08 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1708638559; cv=none; d=zohomail.com; s=zohoarc; b=jm47P35GWGJ5idhfmMhxCHb2nMvZgUZkgmkRN7livAeng6VOVzDZFUX5t72xaxqealAzeNuI7nixn/YxU8Enhz9xCVPah5TOJRFAYYq7M00jQRCe+b2rM9I3sDH8LGg/96kqAswAWboaAu/M7uQsRaJ4Q8mp1eH6hCF4ZZ432KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708638559; 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=LQ9BKDqKz9A1siUplL40xH0xVuGzpE8cGQF2aiXOues=; b=EGWKfr3FCbAZ4d4IOOeAebAgcPpNmK23wVfCeBKqgBu4atYnyQsSdEZLoqqq1HfRXsisvkUhjASe2EBvbsZ+0zzDTKYFFT2b6KexfJmM/GMCsQ6qjL/NlYpUjDYSbJ0tdGsB9kR/xXK2JgCnrwbaQLPPjfW4j5TRKKqdwMn+t50= 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 1708638559128901.4533627669834; Thu, 22 Feb 2024 13:49:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdGvi-0000td-Dg; Thu, 22 Feb 2024 16:48:34 -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 1rdGvF-0000mh-6F for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:06 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdGvC-0005Po-4r for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:04 -0500 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41MIRPlB001370; Thu, 22 Feb 2024 21:47:57 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wamud6105-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:57 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41MKq8Hs022235; Thu, 22 Feb 2024 21:47:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8bft6a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:56 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41MLlqUD037274; Thu, 22 Feb 2024 21:47:56 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3wak8bft40-4; Thu, 22 Feb 2024 21:47:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2023-11-20; bh=LQ9BKDqKz9A1siUplL40xH0xVuGzpE8cGQF2aiXOues=; b=o2bLlr9TRWJ1N4pyaflvd7OPszae7zNBF8DK8gvykI/x2dYMSTqApuy9JEDpWBY1baN+ F4JuquewYrXgQUrsxrt8GmbYAy34uios8P6qRptJjniOqOPM8Up5AfTGPggJUxuFpC78 cbwlZz9dnCdnzUyWHpd2Fq4hncLjp5StxCwvsCxF/vAo9jGT36lSrXIjbsTN42LrsYw1 a9UsHwJ+LXLCPY+/atXpqteWwF63xViT+mJ05IQk5S4yFpdtvvk28gomI/f1NVKDWUjA PCJZMzUvF8WQ2Q7nrrt6DC/AWo5TF2+crDJDTUPtGpFn91oRNgs2jnczpxA3UxEbwcTo HQ== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Steve Sistare Subject: [PATCH V5 3/5] util: strv_from_strList Date: Thu, 22 Feb 2024 13:47:48 -0800 Message-Id: <1708638470-114846-4-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> References: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220169 X-Proofpoint-GUID: h9Dp4syZAY47e-eFWztGFpBaySE3_VLz X-Proofpoint-ORIG-GUID: h9Dp4syZAY47e-eFWztGFpBaySE3_VLz 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=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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 @oracle.com) X-ZM-MESSAGEID: 1708638559980100001 Signed-off-by: Steve Sistare Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qemu/strList.h | 6 ++++++ util/strList.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/qemu/strList.h b/include/qemu/strList.h index 0f26116..c1eb1dd 100644 --- a/include/qemu/strList.h +++ b/include/qemu/strList.h @@ -21,4 +21,10 @@ */ strList *str_split(const char *str, const char *delim); =20 +/* + * Produce and return a NULL-terminated array of strings from @list. + * The result is g_malloc'd and all strings are g_strdup'd. + */ +char **strv_from_strList(const strList *list); + #endif diff --git a/util/strList.c b/util/strList.c index 7588c7c..6da6762 100644 --- a/util/strList.c +++ b/util/strList.c @@ -22,3 +22,17 @@ strList *str_split(const char *str, const char *delim) =20 return res; } + +char **strv_from_strList(const strList *list) +{ + const strList *tail; + int i =3D 0; + char **argv =3D g_new(char *, QAPI_LIST_LENGTH(list) + 1); + + for (tail =3D list; tail !=3D NULL; tail =3D tail->next) { + argv[i++] =3D g_strdup(tail->value); + } + argv[i] =3D NULL; + + return argv; +} --=20 1.8.3.1 From nobody Tue Nov 26 08:53:08 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1708638544; cv=none; d=zohomail.com; s=zohoarc; b=ZqfylH6QjL0+ONaeRPhbjlg2/mijcIImLpYb56ceU6a2hBgcL/d0ub+m8ja4E6w5DiQp+Dw1RQ9st65R3bVFwsW+oJ+HvV3GrxqKqYxWQcXntEsOjeUKqJuDpypx5KBue/B37/ma2SESNdhGsMduOYsBEbZjnhRFmn0Ly3lp4Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708638544; 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=RnPc4eYUt0g0xAZDD5FUqWBAvFTUt2l2aFTg/OWv1i0=; b=Sn1TXjwwYki0WOVIiLqZIYsNmFzm68aNAzYkJbgLCvBY8usfiH4kCk3K2kqmF2FCC+0el8eFYBXoLy+uXaOLc5dfBPhF6E+1/2ADoddq7JPLD/lFQg3i/eidFTV7C8dh7ronxdr0u+L3uCcq5lGCeCIlpu6cmpMDlMQghFiDJ7M= 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 1708638544943514.25475234111; Thu, 22 Feb 2024 13:49:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdGvO-0000oK-Th; Thu, 22 Feb 2024 16:48:16 -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 1rdGvF-0000mi-Cl for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:06 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdGvC-0005Py-CR for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:05 -0500 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41MIRQmR001400; Thu, 22 Feb 2024 21:47:58 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wamud6106-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:58 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41MKxcK4022224; Thu, 22 Feb 2024 21:47:57 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8bft6q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:57 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41MLlqUF037274; Thu, 22 Feb 2024 21:47:57 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3wak8bft40-5; Thu, 22 Feb 2024 21:47:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2023-11-20; bh=RnPc4eYUt0g0xAZDD5FUqWBAvFTUt2l2aFTg/OWv1i0=; b=MQdFtkKzgFtCnqv2j0Y2MWg/4briExUQAjfh4YnZxJvHMAnsVFzRGh8gP+4gqpm36wZZ /u22UH4gvI5dU6qGta/WH/bP4OARrgWn6gF3ZXPF7lKl90lRizqxhBdwtTnIkEkg3p9H 4qrNBkvxyAHK2XLmsipIXVgQ2rA2jEdJbZ5UOvdD7iDKa/326byyfJC5yfOO0TomCVTn Z637AiMo6jZzz3Ra0/EBOTSXkSnPGmY2vWcCIWG47WyGLIu4YXQrq+owy0vxQUYlUTh8 IBAQIPUjdjRWkhguC7Xvqe15MSb7uA4LP/rcySdcio4euBe90/pDrR7TwjRrrsPaFVuI /Q== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Steve Sistare Subject: [PATCH V5 4/5] util: strList unit tests Date: Thu, 22 Feb 2024 13:47:49 -0800 Message-Id: <1708638470-114846-5-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> References: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220169 X-Proofpoint-GUID: jOfdfrmH6h244bNZ9eT0EP9HAHb8XHQB X-Proofpoint-ORIG-GUID: jOfdfrmH6h244bNZ9eT0EP9HAHb8XHQB 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=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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 @oracle.com) X-ZM-MESSAGEID: 1708638546080100003 Signed-off-by: Steve Sistare Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/unit/meson.build | 1 + tests/unit/test-strList.c | 80 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 81 insertions(+) create mode 100644 tests/unit/test-strList.c diff --git a/tests/unit/meson.build b/tests/unit/meson.build index cae925c..9984860 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -35,6 +35,7 @@ tests =3D { 'test-rcu-simpleq': [], 'test-rcu-tailq': [], 'test-rcu-slist': [], + 'test-strList': [], 'test-qdist': [], 'test-qht': [], 'test-qtree': [], diff --git a/tests/unit/test-strList.c b/tests/unit/test-strList.c new file mode 100644 index 0000000..40af6b2 --- /dev/null +++ b/tests/unit/test-strList.c @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2022 - 2024 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/strList.h" + +static strList *make_list(int length) +{ + strList *head =3D 0, *list, **prev =3D &head; + + while (length--) { + list =3D *prev =3D g_new0(strList, 1); + list->value =3D g_strdup("aaa"); + prev =3D &list->next; + } + return head; +} + +static void test_length(void) +{ + strList *list; + int i; + + for (i =3D 0; i < 5; i++) { + list =3D make_list(i); + g_assert_cmpint(i, =3D=3D, QAPI_LIST_LENGTH(list)); + qapi_free_strList(list); + } +} + +struct { + const char *string; + const char *delim; + const char *argv[5]; +} list_data[] =3D { + { NULL, ",", { NULL } }, + { "", ",", { NULL } }, + { "a", ",", { "a", NULL } }, + { "a,b", ",", { "a", "b", NULL } }, + { "a,b,c", ",", { "a", "b", "c", NULL } }, + { "first last", " ", { "first", "last", NULL } }, + { "a:", ":", { "a", "", NULL } }, + { "a::b", ":", { "a", "", "b", NULL } }, + { ":", ":", { "", "", NULL } }, + { ":a", ":", { "", "a", NULL } }, + { "::a", ":", { "", "", "a", NULL } }, +}; + +static void test_strv(void) +{ + int i, j; + const char **expect; + strList *list; + char **argv; + + for (i =3D 0; i < ARRAY_SIZE(list_data); i++) { + expect =3D list_data[i].argv; + list =3D str_split(list_data[i].string, list_data[i].delim); + argv =3D strv_from_strList(list); + qapi_free_strList(list); + for (j =3D 0; expect[j] && argv[j]; j++) { + g_assert_cmpstr(expect[j], =3D=3D, argv[j]); + } + g_assert_null(expect[j]); + g_assert_null(argv[j]); + g_strfreev(argv); + } +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + g_test_add_func("/test-string/length", test_length); + g_test_add_func("/test-string/strv", test_strv); + return g_test_run(); +} --=20 1.8.3.1 From nobody Tue Nov 26 08:53:08 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1708638544; cv=none; d=zohomail.com; s=zohoarc; b=j3cW9p0/DnIk3eLwW3w/HDIHSjD74/jcMsQ1968lTmw67emNNzUakwaim596KIOchMCbrPgWm5AsaDxC61yNOE58T1rnpPSx+XLnEajirTio7n0orbOQmJ8x7HSbT1PSV1ZF/AdCRRzZHvE04P7NKYCWV5Fhv43L5oEaAYWW8hE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708638544; h=Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wfjGAw2wdJR6anhf82VrYoogjJNUoXqn0fWWX0qgRx0=; b=aPBSo+GAs3XSZU2F6L35X+vyL3QA40Urfto8FHqm+lYZzlAE6SH1frWVhWzQs9c2ez/1gy7pGVEyOYWhrbcYSWfk+lzWMMZ7rKtp8yq1IP8zutVcaMy7+nrAlPyRXtW2ou7n49YjpkDKGOlMnBxWwDImL2SiLSJ3VagGXHvieFA= 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 1708638544901840.6536820497414; Thu, 22 Feb 2024 13:49:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdGvL-0000no-Rt; Thu, 22 Feb 2024 16:48:12 -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 1rdGvG-0000mv-HK for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:07 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdGvD-0005QJ-Q4 for qemu-devel@nongnu.org; Thu, 22 Feb 2024 16:48:06 -0500 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41MIRPlC001370; Thu, 22 Feb 2024 21:47:59 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wamud610a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:59 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41MKrRoB022240; Thu, 22 Feb 2024 21:47:58 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8bft75-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2024 21:47:58 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41MLlqUH037274; Thu, 22 Feb 2024 21:47:58 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3wak8bft40-6; Thu, 22 Feb 2024 21:47:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=wfjGAw2wdJR6anhf82VrYoogjJNUoXqn0fWWX0qgRx0=; b=ObcvK7AANrTfkxklx7hGWaUk/OyFO0RBQ7BxJAqimtHCah7iLcUPkKPvEmHLnpIpKdRG KOrDfFjimE2dh0oCaE8JKijuf1lgKDjNWcuO9nv06JmebADGOGhhfWxfN6uqpHZmox3O wjB7L+e2lbxDI9fL0RnPycg//R5sGtjcsB83WCYhDnw239dfUcmRDoLW5+k6qpV4tcMV vJ1RMsiQbdxyz1oKYn20rjhej54ADXp8eHaqgITO6VjwV7PAqCwbeOwlMy5/qGSXvbWI QZ+yTiIZ07YIcTeS/tnx3G1xIj0TBLQiTpKeFwMj9TfwTlTLLYP2nYWkUWdS24lg+tL2 cw== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Steve Sistare Subject: [PATCH V5 5/5] migration: simplify exec migration functions Date: Thu, 22 Feb 2024 13:47:50 -0800 Message-Id: <1708638470-114846-6-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> References: <1708638470-114846-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402220169 X-Proofpoint-GUID: TDdBlGcP0R9rqKEUyAAGzTkjC2x-rghH X-Proofpoint-ORIG-GUID: TDdBlGcP0R9rqKEUyAAGzTkjC2x-rghH 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=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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 @oracle.com) X-ZM-MESSAGEID: 1708638546076100002 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 47d2f3b..1518409 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/strList.h" #include "channel.h" #include "exec.h" #include "migration.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_strList(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_strList(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 1.8.3.1