From patchwork Wed Jul 19 06:07:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 13338853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9AD71C04A94 for ; Wed, 2 Aug 2023 21:37:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.575654.901266 (Exim 4.92) (envelope-from ) id 1qRJXK-00070e-64; Wed, 02 Aug 2023 21:37:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 575654.901266; Wed, 02 Aug 2023 21:37:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRJXK-00070T-2D; Wed, 02 Aug 2023 21:37:42 +0000 Received: by outflank-mailman (input) for mailman id 575654; Wed, 02 Aug 2023 21:37:40 +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 1qRJNK-0004vP-G1 for xen-devel@lists.xenproject.org; Wed, 02 Aug 2023 21:27:22 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5d25a01e-317b-11ee-b263-6b7b168915f2; Wed, 02 Aug 2023 23:27:21 +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 372LRCsJ008463 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 2 Aug 2023 17:27:18 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 372LRCav008462; Wed, 2 Aug 2023 14:27:12 -0700 (PDT) (envelope-from ehem) 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: 5d25a01e-317b-11ee-b263-6b7b168915f2 Message-Id: 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 13/22] tools/utils: move XLU_ConfigList to libxl_cfg.c With XLU_ConfigValue now in libxlu_cfg.c, XLU_ConfigList can follow. Fixes: 1a09c5113a ("libxlu: rework internal representation of setting") Signed-off-by: Elliott Mitchell --- Placing XLU_ConfigValue/XLU_ConfigList in libxlu_internal.h was certainly *wrong*. --- tools/libs/util/libxlu_cfg.c | 6 ++++++ tools/libs/util/libxlu_internal.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libs/util/libxlu_cfg.c b/tools/libs/util/libxlu_cfg.c index d3b5c86ed6..67d1a8123f 100644 --- a/tools/libs/util/libxlu_cfg.c +++ b/tools/libs/util/libxlu_cfg.c @@ -31,6 +31,12 @@ struct XLU_ConfigSetting { int lineno; }; +struct XLU_ConfigList { + int avalues; /* available slots */ + int nvalues; /* actual occupied slots */ + XLU_ConfigValue **values; +}; + struct XLU_ConfigValue { enum XLU_ConfigValueType type; union { diff --git a/tools/libs/util/libxlu_internal.h b/tools/libs/util/libxlu_internal.h index c68669c3a1..310e2145a7 100644 --- a/tools/libs/util/libxlu_internal.h +++ b/tools/libs/util/libxlu_internal.h @@ -25,12 +25,6 @@ #include "libxlutil.h" -struct XLU_ConfigList { - int avalues; /* available slots */ - int nvalues; /* actual occupied slots */ - XLU_ConfigValue **values; -}; - typedef struct XLU_ConfigSetting XLU_ConfigSetting; struct XLU_Config {