From nobody Fri Apr 26 19:53:55 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=1679051779; cv=none; d=zohomail.com; s=zohoarc; b=Lcrdr5SENmYea6LaLre3oGNw84j4C4Zs1tP3HecP0md48wRG6wjdY/WBvKZhoaNf7bqD7Bi2iImHnnOXTGVPmTxlLt6TJ0KDig6UYBprpVOeftZ+1uXfKzqHdkK9cVlh6dahsUaExT6ElcOWQt67cXKHYUrl8pZMWxf1GaESRT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679051779; 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=n3oPmV25/bMhn1KecnqqAe0biDTW2soI213JLeTYovw=; b=BYZX5e+/B1j2sxUfeuFnbHvoY0/z18XrYcvazw93Zz52h0JjWxHw/40B8CXZU2lF7WLmTL/128k8lJHB1skpQ/LrsSngpYaY9H4C9yoGRe406bv6b9Bhh03IyrM+q7DVoYrlJ4sczJ2qLiqZa4dhJYpIqIIKQJvgYin4ytCFudw= 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 1679051779896353.1454381960575; Fri, 17 Mar 2023 04:16:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.511017.789721 (Exim 4.92) (envelope-from ) id 1pd83x-00009a-VC; Fri, 17 Mar 2023 11:15:57 +0000 Received: by outflank-mailman (output) from mailman id 511017.789721; Fri, 17 Mar 2023 11:15:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pd83x-00009S-SW; Fri, 17 Mar 2023 11:15:57 +0000 Received: by outflank-mailman (input) for mailman id 511017; Fri, 17 Mar 2023 11:15:55 +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 1pd83v-00008J-Oi for xen-devel@lists.xenproject.org; Fri, 17 Mar 2023 11:15:55 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2001:67c:2178:6::1d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 152d0043-c4b5-11ed-87f5-c1b5be75604c; Fri, 17 Mar 2023 12:15:54 +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 180CD1FDDC; Fri, 17 Mar 2023 11:15:54 +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 E599B13428; Fri, 17 Mar 2023 11:15:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id b+SuNulLFGTOCwAAMHmgww (envelope-from ); Fri, 17 Mar 2023 11:15:53 +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: 152d0043-c4b5-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679051754; 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=n3oPmV25/bMhn1KecnqqAe0biDTW2soI213JLeTYovw=; b=jD/B6vo9g1NIYhqHk89q5b40spjaLWstlmapBmTYCkxkC7NLfmuoQtjRjQ9Kw29n7DtRxv WSw7ezZ6MJpGagISEBkxJ3G4uZxmmNEYNBMPPtgPOfkOfRQTl6E9/9TE2uQF5P5C0iVXos V2YVsMLlCrcwDSVW+wGsgO+AP7CN9Zs= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH 1/2] tools/xl: allow split_string_into_pair() to trim values Date: Fri, 17 Mar 2023 12:15:45 +0100 Message-Id: <20230317111546.18061-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230317111546.18061-1-jgross@suse.com> References: <20230317111546.18061-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679051780423100001 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 Acked-by: Anthony PERARD Reviewed-by: Jason Andryuk --- 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 853e9f357a..2f9dfea05c 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); @@ -2292,18 +2287,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); @@ -2326,9 +2318,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: @@ -2952,10 +2942,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; @@ -2967,13 +2955,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 Fri Apr 26 19:53:55 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=1679051779; cv=none; d=zohomail.com; s=zohoarc; b=iXuC3DptBbm10VfGWt5wPwjhl3Cjfm7tRrAk+IaCLgNlk1xXJWQ9vvi/o+0XtSGPDQk8GkxXuhEqHzmojHaEYBgTxLkBEbAOIuOihblgNtT6q8fPVcKZA35J8RdOkNFJgfYfY3hYUEYOxMuoux+wGTZpOgndHsUSfgKusFt/WvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679051779; 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=wmNIXjSB6eN0Fkt4tu8jyil8pAFIy60BJceiR3NCVVU=; b=G9EGEJLdWt65nyajvbk6WPTEB6xVyiXKf4J+o9Qcsi4Spe+qwBHp/ytYwG14LsU3WO/IrP5mXw2kd5/wbzeKx5AjCrKV8NKexbE05t+3QLdjq/BeFdsKn0r6NDDz36+IoOC/xKXnaDrt+7EsCIf2x/sgoQLjydGtJxLS0ARfbEw= 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 1679051779654849.4188860605401; Fri, 17 Mar 2023 04:16:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.511018.789731 (Exim 4.92) (envelope-from ) id 1pd842-0000S0-7d; Fri, 17 Mar 2023 11:16:02 +0000 Received: by outflank-mailman (output) from mailman id 511018.789731; Fri, 17 Mar 2023 11:16:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pd842-0000Rr-4S; Fri, 17 Mar 2023 11:16:02 +0000 Received: by outflank-mailman (input) for mailman id 511018; Fri, 17 Mar 2023 11:16:01 +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 1pd841-00008J-Gl for xen-devel@lists.xenproject.org; Fri, 17 Mar 2023 11:16:01 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 18da0016-c4b5-11ed-87f5-c1b5be75604c; Fri, 17 Mar 2023 12:16:00 +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 415B41FDDC; Fri, 17 Mar 2023 11:16:00 +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 196D313428; Fri, 17 Mar 2023 11:16:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ftXABPBLFGTuCwAAMHmgww (envelope-from ); Fri, 17 Mar 2023 11:16:00 +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: 18da0016-c4b5-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679051760; 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=wmNIXjSB6eN0Fkt4tu8jyil8pAFIy60BJceiR3NCVVU=; b=UAs4qU9uSRVHyOnB1nwekwXirgg1ajAOBOa3flPRDWp4mKttLBxIXn3RaUflgqlQfxL4d7 AViNMIszWpeZHWFOlrsWcxg/KFhsk8OmMPbYXnKqwQTBZtGCEXfLHf7ywvcRgvHc6aFqqK uhNSKdxKhIRaePT241fqQjz2HQJUoAo= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH 2/2] tools/xl: rework p9 config parsing Date: Fri, 17 Mar 2023 12:15:46 +0100 Message-Id: <20230317111546.18061-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230317111546.18061-1-jgross@suse.com> References: <20230317111546.18061-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1679051780462100002 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 --- tools/xl/xl_parse.c | 72 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 2f9dfea05c..715e14f95f 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2111,54 +2111,52 @@ 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); + if (!p9->path || !p9->security_model || !p9->tag) { + fprintf(stderr, "9pfs spec missing required field!\n"); + exit(1); + } } } =20 --=20 2.35.3