From nobody Mon Feb 9 11:34:47 2026 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; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1689785860943896.4921643900062; Wed, 19 Jul 2023 09:57:40 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.566092.884728 (Exim 4.92) (envelope-from ) id 1qMAUO-0004Xx-11; Wed, 19 Jul 2023 16:57:24 +0000 Received: by outflank-mailman (output) from mailman id 566092.884728; Wed, 19 Jul 2023 16:57:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMAUN-0004Xk-TA; Wed, 19 Jul 2023 16:57:23 +0000 Received: by outflank-mailman (input) for mailman id 566092; Wed, 19 Jul 2023 16:57:22 +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 1qMATe-00037w-B5 for xen-devel@lists.xenproject.org; Wed, 19 Jul 2023 16:56:38 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 392a26b5-2655-11ee-b23a-6b7b168915f2; Wed, 19 Jul 2023 18:56:37 +0200 (CEST) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 36JGuSsM034084 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 19 Jul 2023 12:56:34 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 36JGuSMU034083; Wed, 19 Jul 2023 09:56:28 -0700 (PDT) (envelope-from ehem) 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: 392a26b5-2655-11ee-b23a-6b7b168915f2 Message-Id: <56c1d2d7360945f5507817585c8303ad46072aee.1689779749.git.ehem+xen@m5p.com> In-Reply-To: References: From: Elliott Mitchell To: xen-devel@lists.xenproject.org Cc: Wei Liu Cc: Anthony PERARD Cc: Juergen Gross Date: Tue, 18 Jul 2023 23:07:20 -0700 Subject: [PATCH 7/7] tools/utils: move remaining lower-layer data from libxlu_internal.h X-Spam-Status: No, score=1.5 required=10.0 tests=DATE_IN_PAST_06_12, KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mattapan.m5p.com X-ZM-MESSAGEID: 1689785862918100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Correcting the order of #includes and data type declarations allows the remaining lower-layer structures to move to libxlu_cfg_i.h. Now libxlu_internal.h is purely generalized routines meant to be shared between all layers. Signed-off-by: Elliott Mitchell --- tools/libs/util/libxlu_cfg.c | 2 +- tools/libs/util/libxlu_cfg_i.h | 31 +++++++++++++++++++++++++++++++ tools/libs/util/libxlu_internal.h | 30 ------------------------------ 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/tools/libs/util/libxlu_cfg.c b/tools/libs/util/libxlu_cfg.c index 2979d775a6..2913c99478 100644 --- a/tools/libs/util/libxlu_cfg.c +++ b/tools/libs/util/libxlu_cfg.c @@ -21,9 +21,9 @@ #include =20 #include "libxlu_internal.h" +#include "libxlu_cfg_i.h" #include "libxlu_cfg_y.h" #include "libxlu_cfg_l.h" -#include "libxlu_cfg_i.h" =20 typedef struct XLU_ConfigSetting { /* transparent */ struct XLU_ConfigSetting *next; diff --git a/tools/libs/util/libxlu_cfg_i.h b/tools/libs/util/libxlu_cfg_i.h index 7193867422..1c6a44b60f 100644 --- a/tools/libs/util/libxlu_cfg_i.h +++ b/tools/libs/util/libxlu_cfg_i.h @@ -19,6 +19,37 @@ #define LIBXLU_CFG_I_H =20 #include "libxlu_internal.h" + +struct XLU_ConfigList { + int avalues; /* available slots */ + int nvalues; /* actual occupied slots */ + XLU_ConfigValue **values; +}; + +typedef struct YYLTYPE +{ + int first_line; + int first_column; + int last_line; + int last_column; +} YYLTYPE; +#define YYLTYPE_IS_DECLARED + +struct XLU_ConfigValue { + enum XLU_ConfigValueType type; + union { + char *string; + XLU_ConfigList list; + } u; + YYLTYPE loc; +}; + +typedef struct { + XLU_Config *cfg; + int err, lexerrlineno, likely_python; + void *scanner; +} CfgParseContext; + #include "libxlu_cfg_y.h" =20 enum XLU_Operation { diff --git a/tools/libs/util/libxlu_internal.h b/tools/libs/util/libxlu_int= ernal.h index 97303391c6..7cbb2e632d 100644 --- a/tools/libs/util/libxlu_internal.h +++ b/tools/libs/util/libxlu_internal.h @@ -25,36 +25,6 @@ =20 #include "libxlutil.h" =20 -struct XLU_ConfigList { - int avalues; /* available slots */ - int nvalues; /* actual occupied slots */ - XLU_ConfigValue **values; -}; - -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -#define YYLTYPE_IS_DECLARED - -struct XLU_ConfigValue { - enum XLU_ConfigValueType type; - union { - char *string; - XLU_ConfigList list; - } u; - YYLTYPE loc; -}; - -typedef struct { - XLU_Config *cfg; - int err, lexerrlineno, likely_python; - void *scanner; -} CfgParseContext; - =20 #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) --=20 2.30.2