From nobody Mon Apr 29 10:11:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1679470525; cv=none; d=zohomail.com; s=zohoarc; b=NHrblif2VT+Oqx1e51c0quwWiLE1lMjwtwhASvOAZnrNpLkpujbrbK2PyOT962hAsoQ0+/3Hh5Z3ajQ534SqlF8uljr2UrZyE6Hjzx70XWE9pxcwGVaCRVHHTYM3clk422/VvDOVkdVCrQduRtEyT9x3MSG6uYso8C+VcbDMP3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679470525; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AqAAdYJutUgTcEYFEIRv9pmaALr54jUwXPZoDBAn7a8=; b=iHozKuQC4QC7riYdXwa5nlC0qyjWycbKcMO+5OCkWnCyFt8DTuWgztOzl4DTiAA6duDyBixCwjRMRzzZs2IW3dZb3TGNGrDjAHf+PMs6R/yAqFjZrrFlOZLfj6gL6M1hIqe6gekvs+cAOGZLzELXKM45COZZTP79NondchwkMbQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16794705253825.099222639999539; Wed, 22 Mar 2023 00:35:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513127.793682 (Exim 4.92) (envelope-from ) id 1peszw-0005O5-EA; Wed, 22 Mar 2023 07:35:04 +0000 Received: by outflank-mailman (output) from mailman id 513127.793682; Wed, 22 Mar 2023 07:35:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1peszw-0005Nw-B9; Wed, 22 Mar 2023 07:35:04 +0000 Received: by outflank-mailman (input) for mailman id 513127; Wed, 22 Mar 2023 07:35:02 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1peszu-000573-7W for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 07:35:02 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2001:67c:2178:6::1c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0df7312a-c884-11ed-85db-49a42c6b2330; Wed, 22 Mar 2023 08:35:01 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4AF9F3382B; Wed, 22 Mar 2023 07:35:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1EF4F13416; Wed, 22 Mar 2023 07:35:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id J7kgBqWvGmTEDAAAMHmgww (envelope-from ); Wed, 22 Mar 2023 07:35:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0df7312a-c884-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679470501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AqAAdYJutUgTcEYFEIRv9pmaALr54jUwXPZoDBAn7a8=; b=CTdafhiVTPmrVvUOTaP2NF+U9FyVdDyicV/O/GOQlLl6N/a+ehThQKDPeGdZfTFxhb0XCA rPlDs1bFBdAoSfgLomKOp3giYMwtvwrrJZnwXjr6QqWJNKwDDxUTIxoZkB+YUrU/sHiHW0 OKa1tHP5Vkin19FujDOmlmTDowaUtyw= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD , Jason Andryuk Subject: [PATCH v2 1/3] tools/xl: allow split_string_into_pair() to trim values Date: Wed, 22 Mar 2023 08:34:51 +0100 Message-Id: <20230322073453.7853-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322073453.7853-1-jgross@suse.com> References: <20230322073453.7853-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679470526310100002 Content-Type: text/plain; charset="utf-8" Most use cases of split_string_into_pair() are requiring the returned strings to be white space trimmed. In order to avoid the same code pattern multiple times, add a predicate parameter to split_string_into_pair() which can be specified to call trim() with that predicate for the string pair returned. Specifying NULL for the predicate will avoid the call of trim(). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/xl/xl_parse.c | 42 +++++++++++++++++++----------------------- tools/xl/xl_parse.h | 4 ++-- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index e344d4fda3..0e1b6907fa 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -646,7 +646,7 @@ static void parse_vnuma_config(const XLU_Config *config, conf_count++) { =20 if (xlu_cfg_value_type(conf_option) =3D=3D XLU_STRING) { - char *buf, *option_untrimmed, *value_untrimmed; + char *buf; char *option, *value; unsigned long val; =20 @@ -654,15 +654,12 @@ static void parse_vnuma_config(const XLU_Config *conf= ig, =20 if (!buf) continue; =20 - if (split_string_into_pair(buf, "=3D", - &option_untrimmed, - &value_untrimmed)) { + if (split_string_into_pair(buf, "=3D", &option, &value, + isspace)) { fprintf(stderr, "xl: failed to split \"%s\" into pair\= n", buf); exit(EXIT_FAILURE); } - trim(isspace, option_untrimmed, &option); - trim(isspace, value_untrimmed, &value); =20 if (!strcmp("pnode", option)) { val =3D parse_ulong(value); @@ -715,8 +712,6 @@ static void parse_vnuma_config(const XLU_Config *config, } free(option); free(value); - free(option_untrimmed); - free(value_untrimmed); } } } @@ -838,7 +833,7 @@ int parse_vdispl_config(libxl_device_vdispl *vdispl, ch= ar *token) =20 rc =3D split_string_into_pair(connectors[i], ":", &vdispl->connectors[i].unique_id, - &resolution); + &resolution, NULL); =20 rc=3D sscanf(resolution, "%ux%u", &vdispl->connectors[i].width, &vdispl->connectors[i].height); @@ -2361,18 +2356,15 @@ void parse_config_data(const char *config_source, split_string_into_string_list(buf, ",", &pairs); len =3D libxl_string_list_length(&pairs); for (i =3D 0; i < len; i++) { - char *key, *key_untrimmed, *value, *value_untrimmed; + char *key, *value; int rc; - rc =3D split_string_into_pair(pairs[i], "=3D", - &key_untrimmed, - &value_untrimmed); + rc =3D split_string_into_pair(pairs[i], "=3D", &key, &valu= e, + isspace); if (rc !=3D 0) { fprintf(stderr, "failed to parse channel configuration= : %s", pairs[i]); exit(1); } - trim(isspace, key_untrimmed, &key); - trim(isspace, value_untrimmed, &value); =20 if (!strcmp(key, "backend")) { replace_string(&chn->backend_domname, value); @@ -2395,9 +2387,7 @@ void parse_config_data(const char *config_source, " ignoring\n", key); } free(key); - free(key_untrimmed); free(value); - free(value_untrimmed); } switch (chn->connection) { case LIBXL_CHANNEL_CONNECTION_UNKNOWN: @@ -3021,10 +3011,8 @@ void trim(char_predicate_t predicate, const char *in= put, char **output) *output =3D result; } =20 -int split_string_into_pair(const char *str, - const char *delim, - char **a, - char **b) +int split_string_into_pair(const char *str, const char *delim, + char **a, char **b, char_predicate_t predicate) { char *s, *p, *saveptr, *aa =3D NULL, *bb =3D NULL; int rc =3D 0; @@ -3036,13 +3024,21 @@ int split_string_into_pair(const char *str, rc =3D ERROR_INVAL; goto out; } - aa =3D xstrdup(p); + if (predicate) { + trim(predicate, p, &aa); + } else { + aa =3D xstrdup(p); + } p =3D strtok_r(NULL, delim, &saveptr); if (p =3D=3D NULL) { rc =3D ERROR_INVAL; goto out; } - bb =3D xstrdup(p); + if (predicate) { + trim(predicate, p, &bb); + } else { + bb =3D xstrdup(p); + } =20 *a =3D aa; aa =3D NULL; diff --git a/tools/xl/xl_parse.h b/tools/xl/xl_parse.h index bab2861f8c..ab35c68545 100644 --- a/tools/xl/xl_parse.h +++ b/tools/xl/xl_parse.h @@ -45,14 +45,14 @@ int match_option_size(const char *prefix, size_t len, =20 void split_string_into_string_list(const char *str, const char *delim, libxl_string_list *psl); -int split_string_into_pair(const char *str, const char *delim, - char **a, char **b); void replace_string(char **str, const char *val); =20 /* NB: this follows the interface used by . See 'man 3 ctype' and look for CTYPE in libxl_internal.h */ typedef int (*char_predicate_t)(const int c); void trim(char_predicate_t predicate, const char *input, char **output); +int split_string_into_pair(const char *str, const char *delim, + char **a, char **b, char_predicate_t predicate); =20 const char *get_action_on_shutdown_name(libxl_action_on_shutdown a); =20 --=20 2.35.3 From nobody Mon Apr 29 10:11:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1679470529; cv=none; d=zohomail.com; s=zohoarc; b=CzYKMkoA+YNfYvjB6Tw/ZGinXqHJ9OHzOAa7mJtC0+PlM5ny/8ZZYL0ZcW3V4I/dPHuJKvJ80T4e1U0JnSX/lRum9+R+qzBRzjh6fNcurNaQoKPxPN82Tia6evcOWKO9KnEbSSNvdRVjk8Tai6Xt+AeRbM+QSHfQi9S1BEVMAtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679470529; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PjEAqwHz5FepjmHP5AZRztMb7s0s81/7SZNZzGRzni4=; b=oKJb6Pja7oHZNTWDEyNLInptnbT6LE1W9sd08ayyWbFpq3k2N9iQAdQlo7rOL/inbQa7fay/o4aiP128dqS61VUfMPghksgNJoxNI/7iFpAIgk1dlV3uTa5csBMiYpGZ/AgluNymwn8UJ0jLR5UcWXNSfbBRYUHNzN0VI1sDaAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679470529266245.36866885834593; Wed, 22 Mar 2023 00:35:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513128.793693 (Exim 4.92) (envelope-from ) id 1pet01-0005hp-RB; Wed, 22 Mar 2023 07:35:09 +0000 Received: by outflank-mailman (output) from mailman id 513128.793693; Wed, 22 Mar 2023 07:35:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pet01-0005hi-O0; Wed, 22 Mar 2023 07:35:09 +0000 Received: by outflank-mailman (input) for mailman id 513128; Wed, 22 Mar 2023 07:35:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pet01-0005gx-3U for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 07:35:09 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 114a09b7-c884-11ed-b464-930f4c7d94ae; Wed, 22 Mar 2023 08:35:07 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DCB153382B; Wed, 22 Mar 2023 07:35:06 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B203213416; Wed, 22 Mar 2023 07:35:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GfwsKqqvGmTjDAAAMHmgww (envelope-from ); Wed, 22 Mar 2023 07:35:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 114a09b7-c884-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679470506; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PjEAqwHz5FepjmHP5AZRztMb7s0s81/7SZNZzGRzni4=; b=kMnWicPXpJAwWrrs9WAMz4UHTp3PAb4d7RziXIiG4P26B7NNtfYQsxzWuR67XpgxUPHgTY ftqaxULJLGd1CBtetv4Lp4jHJn+kxLV41WbopvhUE/1hy3/cWZ0o4Ji2B4krDmFC78lNDL e8tIVhtXbopql16JAsw6JdkGwG7cqX4= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH v2 2/3] tools/xl: make split_string_into_pair() more usable Date: Wed, 22 Mar 2023 08:34:52 +0100 Message-Id: <20230322073453.7853-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322073453.7853-1-jgross@suse.com> References: <20230322073453.7853-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679470530324100001 Content-Type: text/plain; charset="utf-8" Today split_string_into_pair() will not really do what its name is suggesting: instead of splitting a string into a pair of strings using a delimiter, it will return the first two strings of the initial string by using the delimiter. This is never what the callers want, so modify split_string_into_pair() to split the string only at the first delimiter found, resulting in something like "x=3Da=3Db" to be split into "x" and "a=3Db" when being call= ed with "=3D" as the delimiter. Today the returned strings would be "x" and "a". At the same time switch the delimiter from "const char *" (allowing multiple delimiter characters) to "char" (a single character only), as this makes the function more simple without breaking any use cases. Suggested-by: Anthony PERARD Signed-off-by: Juergen Gross Acked-by: Anthony PERARD Reviewed-by: Jason Andryuk --- V2: - new patch --- tools/xl/xl_parse.c | 23 ++++++++++++----------- tools/xl/xl_parse.h | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 0e1b6907fa..09cabd2732 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -654,7 +654,7 @@ static void parse_vnuma_config(const XLU_Config *config, =20 if (!buf) continue; =20 - if (split_string_into_pair(buf, "=3D", &option, &value, + if (split_string_into_pair(buf, '=3D', &option, &value, isspace)) { fprintf(stderr, "xl: failed to split \"%s\" into pair\= n", buf); @@ -831,7 +831,7 @@ int parse_vdispl_config(libxl_device_vdispl *vdispl, ch= ar *token) { char *resolution; =20 - rc =3D split_string_into_pair(connectors[i], ":", + rc =3D split_string_into_pair(connectors[i], ':', &vdispl->connectors[i].unique_id, &resolution, NULL); =20 @@ -2358,7 +2358,7 @@ void parse_config_data(const char *config_source, for (i =3D 0; i < len; i++) { char *key, *value; int rc; - rc =3D split_string_into_pair(pairs[i], "=3D", &key, &valu= e, + rc =3D split_string_into_pair(pairs[i], '=3D', &key, &valu= e, isspace); if (rc !=3D 0) { fprintf(stderr, "failed to parse channel configuration= : %s", @@ -3011,26 +3011,27 @@ void trim(char_predicate_t predicate, const char *i= nput, char **output) *output =3D result; } =20 -int split_string_into_pair(const char *str, const char *delim, - char **a, char **b, char_predicate_t predicate) +int split_string_into_pair(const char *str, char delim, char **a, char **b, + char_predicate_t predicate) { - char *s, *p, *saveptr, *aa =3D NULL, *bb =3D NULL; + char *s, *p, *aa =3D NULL, *bb =3D NULL; int rc =3D 0; =20 s =3D xstrdup(str); =20 - p =3D strtok_r(s, delim, &saveptr); + p =3D strchr(s, delim); if (p =3D=3D NULL) { rc =3D ERROR_INVAL; goto out; } + *p =3D 0; if (predicate) { - trim(predicate, p, &aa); + trim(predicate, s, &aa); } else { - aa =3D xstrdup(p); + aa =3D xstrdup(s); } - p =3D strtok_r(NULL, delim, &saveptr); - if (p =3D=3D NULL) { + p++; + if (!*p) { rc =3D ERROR_INVAL; goto out; } diff --git a/tools/xl/xl_parse.h b/tools/xl/xl_parse.h index ab35c68545..fe0d586cdd 100644 --- a/tools/xl/xl_parse.h +++ b/tools/xl/xl_parse.h @@ -51,8 +51,8 @@ void replace_string(char **str, const char *val); and look for CTYPE in libxl_internal.h */ typedef int (*char_predicate_t)(const int c); void trim(char_predicate_t predicate, const char *input, char **output); -int split_string_into_pair(const char *str, const char *delim, - char **a, char **b, char_predicate_t predicate); +int split_string_into_pair(const char *str, char delim, char **a, char **b, + char_predicate_t predicate); =20 const char *get_action_on_shutdown_name(libxl_action_on_shutdown a); =20 --=20 2.35.3 From nobody Mon Apr 29 10:11:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1679470537; cv=none; d=zohomail.com; s=zohoarc; b=frE1//wsuSCCzwNKHSwKGgGpnCK7ANyTDD7Dist1iQLBm0PTt6j7j3FiMgd0sb6FIoYXSSYU348d6EBtJIP5RFHCjlG3mTswDSfvHjw63P+32wal1cVT2f23J2Z2fErGl0zT3/KAMo3odJUFN0lZ3jJ6sxgcd7fzMUZr1aH2MRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679470537; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YtiGh+qpU8bhgvUDsffds7Kvt+PAjE83auDMMPS8CWk=; b=YiT6z77Sx/kBb+FUfBFVhJpGJ/ieaNUnrY1k7/GlR8Qs2zSnwIxK9qj3GrOVpxC7F0tXDKqw8FuKR+Vu22Bw4oqYwOJWLT45AA2ya2hD9Z3USeRpbFcjxx93ZGjbEeVRKAU4SSsoB84ulhHZKRiNJAQzewdcq8ag9i6pEymxV1E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679470537603930.8723017738189; Wed, 22 Mar 2023 00:35:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513130.793703 (Exim 4.92) (envelope-from ) id 1pet08-0006ER-4P; Wed, 22 Mar 2023 07:35:16 +0000 Received: by outflank-mailman (output) from mailman id 513130.793703; Wed, 22 Mar 2023 07:35:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pet08-0006EG-0r; Wed, 22 Mar 2023 07:35:16 +0000 Received: by outflank-mailman (input) for mailman id 513130; Wed, 22 Mar 2023 07:35:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pet06-0005gx-8w for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 07:35:14 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 149c1540-c884-11ed-b464-930f4c7d94ae; Wed, 22 Mar 2023 08:35:12 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 74BAF20AD9; Wed, 22 Mar 2023 07:35:12 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 49C1D13416; Wed, 22 Mar 2023 07:35:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 38WeELCvGmQADQAAMHmgww (envelope-from ); Wed, 22 Mar 2023 07:35:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 149c1540-c884-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679470512; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YtiGh+qpU8bhgvUDsffds7Kvt+PAjE83auDMMPS8CWk=; b=P5Qud/Y725woH3pW9dgAoEv14k/3mIDTXLzYKPLAUoUM51zWeOKRWCYLP1bWB1qNjwMHSW syd5fSWzdofh6iDNgstloR1u6sU6hwHdMk/j7P9sZpE1xC5/NM5aweDg9bfBS/K4YFymtj q+/WeYrgaf3I7EmNq0eGhpU24UNM630= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH v2 3/3] tools/xl: rework p9 config parsing Date: Wed, 22 Mar 2023 08:34:53 +0100 Message-Id: <20230322073453.7853-4-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322073453.7853-1-jgross@suse.com> References: <20230322073453.7853-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679470538267100001 Content-Type: text/plain; charset="utf-8" Rework the config parsing of a p9 device to use the split_string_into_pair() function instead of open coding it. Signed-off-by: Juergen Gross Acked-by: Anthony PERARD Reviewed-by: Jason Andryuk --- V2: - add libxl_string_list_dispose() call (Jason Andryuk) --- tools/xl/xl_parse.c | 74 ++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 09cabd2732..1f6f47daf4 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2180,54 +2180,54 @@ void parse_config_data(const char *config_source, =20 if (!xlu_cfg_get_list(config, "p9", &p9devs, 0, 0)) { libxl_device_p9 *p9; - char *security_model =3D NULL; - char *path =3D NULL; - char *tag =3D NULL; - char *backend =3D NULL; - char *p, *p2, *buf2; =20 d_config->num_p9s =3D 0; d_config->p9s =3D NULL; while ((buf =3D xlu_cfg_get_listitem (p9devs, d_config->num_p9s)) = !=3D NULL) { + libxl_string_list pairs; + int len; + p9 =3D ARRAY_EXTEND_INIT(d_config->p9s, d_config->num_p9s, libxl_device_p9_init); libxl_device_p9_init(p9); =20 - buf2 =3D strdup(buf); - p =3D strtok(buf2, ","); - if(p) { - do { - while(*p =3D=3D ' ') - ++p; - if ((p2 =3D strchr(p, '=3D')) =3D=3D NULL) - break; - *p2 =3D '\0'; - if (!strcmp(p, "security_model")) { - security_model =3D strdup(p2 + 1); - } else if(!strcmp(p, "path")) { - path =3D strdup(p2 + 1); - } else if(!strcmp(p, "tag")) { - tag =3D strdup(p2 + 1); - } else if(!strcmp(p, "backend")) { - backend =3D strdup(p2 + 1); - } else { - fprintf(stderr, "Unknown string `%s' in 9pfs spec\n",= p); - exit(1); - } - } while ((p =3D strtok(NULL, ",")) !=3D NULL); - } - if (!path || !security_model || !tag) { - fprintf(stderr, "9pfs spec missing required field!\n"); - exit(1); + split_string_into_string_list(buf, ",", &pairs); + len =3D libxl_string_list_length(&pairs); + for (i =3D 0; i < len; i++) { + char *key, *value; + int rc; + + rc =3D split_string_into_pair(pairs[i], '=3D', &key, &valu= e, + isspace); + if (rc !=3D 0) { + fprintf(stderr, "failed to parse 9pfs configuration: %= s", + pairs[i]); + exit(1); + } + + if (!strcmp(key, "security_model")) { + replace_string(&p9->security_model, value); + } else if (!strcmp(key, "path")) { + replace_string(&p9->path, value); + } else if (!strcmp(key, "tag")) { + replace_string(&p9->tag, value); + } else if (!strcmp(key, "backend")) { + replace_string(&p9->backend_domname, value); + } else { + fprintf(stderr, "Unknown 9pfs parameter '%s'\n", key); + exit(1); + } + free(key); + free(value); } - free(buf2); =20 - replace_string(&p9->tag, tag); - replace_string(&p9->security_model, security_model); - replace_string(&p9->path, path); - if (backend) - replace_string(&p9->backend_domname, backend); + libxl_string_list_dispose(&pairs); + + if (!p9->path || !p9->security_model || !p9->tag) { + fprintf(stderr, "9pfs spec missing required field!\n"); + exit(1); + } } } =20 --=20 2.35.3