From nobody Tue Sep 9 23:53:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=cyberus-technology.de Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1748416383391431.19201999671577; Wed, 28 May 2025 00:13:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 782B41425; Wed, 28 May 2025 03:13:02 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 64AC0163F; Wed, 28 May 2025 03:11:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 89BB61339; Wed, 28 May 2025 03:11:22 -0400 (EDT) Received: from FR6P281CU001.outbound.protection.outlook.com (mail-germanywestcentralazon11020116.outbound.protection.outlook.com [52.101.171.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9BE621397 for ; Wed, 28 May 2025 03:11:20 -0400 (EDT) Received: from BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:46::5) by BEYP281MB4060.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:b3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.29; Wed, 28 May 2025 07:11:14 +0000 Received: from BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM ([fe80::7272:f32d:eb8d:e401]) by BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM ([fe80::7272:f32d:eb8d:e401%5]) with mapi id 15.20.8769.025; Wed, 28 May 2025 07:11:14 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FORGED_SPF_HELO,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Yxcj7DVCTBXZM9A/imj+YqxqNTJzrOQCBsJ1LB20TNTMoJ9ed65Pjn/JeYj8VF4QNrj0G8TFXoOXNnCBLdZIv6smBCsa1EEPjvPBBPy4lZzwsB72+f31kXfmhgM9thtrF07pdvZclhYu8WUMmQRmH+ZYCIeVwPu734TuZghi8A5qekkls0ksDz6k7MleT9cQyZ1kgBE24X0UCSXRi0c/CXqA+fbApPz1wNorx++EkwEGjSf76+mKv1V7Hw2svfbkzkhkBqB+DSiHfwnUIB4xBL+Ng6LnwFwljkCgB4cy/wOEA6dcnS7V4wZ/o0bx6ky2sC4pYiBEnNl6JM9mPZKPQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j6OWSBkA5oxQFWzJnRF7JIGyJG5UnzXXyPO7rX/E+co=; b=AsGjGekH7/uoefNOSoGpU0fdSsL/BZOJhASu7BejUAAJ5KZsZOJNv4bYKqWCfjaPHZY6adGkPsGo3z1ovjkUN+tk3quMpCPknRwWCpsUuU+dsrieF9xGbrAY64CNK3lTkBuxoKhljZY5FcheYAqXh1GI2wnqRZZkhFYFCseo7kuO+wwDsJFlD2TlFlBB3LY/7PocGJBG/IrpLzbipvb3nOhT9HJqn+zU9IKBGiiUzq39KA/XD1B8k24z7suFqkjBwnGs1/9nRHCK7eZyOBzuAaDjHEfqmw+v2tbELG3eQlMC8Sgo58Z/dPPHJtWHR5F43sB7476AOaEDmRCShFvcHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cyberus-technology.de; dmarc=pass action=none header.from=cyberus-technology.de; dkim=pass header.d=cyberus-technology.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cyberus-technology.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j6OWSBkA5oxQFWzJnRF7JIGyJG5UnzXXyPO7rX/E+co=; b=St1w/XQUc9zenTZfPZFqoqmzFR4jaVskF5a7u1NzF+oRyHKQMXDpx79Wpw3bokUUfgtg6QTfElVDt2agD9zO52uGFzmuRKRH4hj+3m+2f+58KJTJ7P+tkM8qJnEO0yzwvcZUJBmV4pdA9NfBVuvGH+aEpT+XhXr48DrD5Qgdb6BE0Z3vQbNxtPU63t4wayCgyDI36Pfr94Y4kNR/fVVwILUwuraj1q8S/MUKc+wy0T5BRWPFP9qAH0NtbQnwbEPAC8FppGe4nEPUDhgEeIZKa+ApDlyln24QNLZmaGjSq9BYK619a2pQK+2PsbqXvfIn7wb2I+3SBomx5MWu5VJP8g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cyberus-technology.de; From: Stefan Kober To: devel@lists.libvirt.org Subject: [PATCH v3 2/3] ch: add log level configuration option Date: Wed, 28 May 2025 09:11:04 +0200 Message-ID: <20250528071105.8885-3-stefan.kober@cyberus-technology.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528071105.8885-1-stefan.kober@cyberus-technology.de> References: <20250528071105.8885-1-stefan.kober@cyberus-technology.de> X-ClientProxiedBy: FR3P281CA0115.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::10) To BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:46::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BEZP281MB1973:EE_|BEYP281MB4060:EE_ X-MS-Office365-Filtering-Correlation-Id: a69e6aac-0c35-481d-f239-08dd9db6d4fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?X7QqQNpN/foJjuD2YMvzmrhMPQfUUb2gY/EceyNJ21agNx3LOKuBwPiuWiFD?= =?us-ascii?Q?46z5f2HyKaS6akvbYSFwMO6J8h53TgQTEF65n4EOnntqamLPmObalL9kmMEC?= =?us-ascii?Q?PvpUN1kC19NQtqk5cJTL+LOgQ1FDXHSL+257eKbS3PQiyaPK+hI9oqIv8Niw?= =?us-ascii?Q?3Dg9mn99PGAdHIbeh5VvwTwd2+rK+JAqz/INqI7lho90NWHaPGTbKqaovXTg?= =?us-ascii?Q?10SdGtLoD4SHKecLnnFEybX2Eq8dhdNDvB3ZklozziXWDn/JkAiy8msGP3RW?= =?us-ascii?Q?LB9pFeHG8JRt5jmg1QwvmFUY0+4ZaMvIw/17PqXWibkKu99Wtvi1XOMX248a?= =?us-ascii?Q?/IAJN6NMBALaD/V/wT1mw0nbdTJtB2AA+sJ/U19qAg22AJzWQBpn3/87rI5K?= =?us-ascii?Q?BWdpqLa4fHALs9eOLNGDrx1Bt7DWCSOkYj5zTBdL0vYOYo1RkTG+egAc7S7L?= =?us-ascii?Q?IQ5+gLq28ccGtOHkexNykkl9LtyzQpP3Avx5wqEqddPyO7gtd1HLiRIeaRcA?= =?us-ascii?Q?8RGS0kNzci1VYt1F5QEDnk/RCArCyrbN7EGOI0NbZ0DvfR7kg8RnE5nrWbz7?= =?us-ascii?Q?q3mcgSwXVr++jM9LJ9F3TJscSbIqhD3Z04140j28Pa28sRcxl1F6FimgbbpC?= =?us-ascii?Q?Zlgo+SrMb3AtZR67Rev8BbFIKBxpVI803tke0nlLmb2vE4uKUOT9YDRnPXSI?= =?us-ascii?Q?Dh1zWZ5Y4mF92GhzG3n4+lvEA/WhWvqcY45bv8dtyQtHQ9Y2+gj6s7P/h8Fu?= =?us-ascii?Q?D7qRUazpINNhQBUm5qJzsiLd0SsqUhgGPBXUGDWtsrTFUlvYpTMtqOZW4Uxu?= =?us-ascii?Q?85x1tOqSwGnNl4/Bd1owS6v+lzihZonv52sIgfiQwFjhzT7iEB4ynXyxBjum?= =?us-ascii?Q?TwIFhxPss/Fe35eNa158RqGw+4IlnCh6+nXUAzRBzTQeFzaNrA4/IH5y88w0?= =?us-ascii?Q?WrAON3BPCCXSd4B5e3ooU2ofom88LodZBocL9jbOTdNoQ/c9ABQLS4Jb/0IM?= =?us-ascii?Q?H2XWWEfB9hdLlpVN8zVSJSnI0ato0qjZIYFa01h+rzZPx/fqXt0pg1G6CjEv?= =?us-ascii?Q?COGGdTTf21hgewNlR8zy3+Oap+6sbJESl7Z/LiAQQHpmvXAvop1YKkwCivx/?= =?us-ascii?Q?7nrChCcOPcxlO22To+1x/7RJV6A0FYvQ53xqT+PvApuoZK9m0Vkya/r7hOkj?= =?us-ascii?Q?0OeC2+qDYSHD0vv9EXb8PUf+Sy1m+V6lkB7yrh91dyS1a7HhwyGcA3coNg3W?= =?us-ascii?Q?xO2tx9aNnXopRNmZwholSkidjqptJE+ZBrlCq9E1Z7rAsdmqmkdW9Gfmfg5+?= =?us-ascii?Q?7Lp/Esbl1oEVCvaLkabvvRaDI0hXhS9QC/SYuZc3rtc+dNoPMsuSexOokQAo?= =?us-ascii?Q?vocHlF8ZsYpGudZuQIXcfQp21iUVgtT0Oy59ZPVsUlYfnjJZ5dMAJTYX3P+Q?= =?us-ascii?Q?i3PfNsi8wyA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016)(10070799003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wpdb3fOSHMbGb0w5nZTQhACf10d+o9G4ZDq8Yn7HfYU8i4Iwy2FZKnvesxL5?= =?us-ascii?Q?1dsdo84NDRwLFPVxH7MsO5I2mCUYRkgDUdka/P/BLhSn+hWYF52BpjEaC7ip?= =?us-ascii?Q?zFA+L9pQIEE1/aAQkObJB7LSAUGVlRMNXKkDosTxPV9/qYRhzO2ngMDJXSg6?= =?us-ascii?Q?TZZpITyCKRU9A353VNAh+sPYUSwMXVuv9qAqXPvyVr2QyGBQ0E4NppySx/av?= =?us-ascii?Q?yHZMIZFWBTjaNbYh+7JPn3Yz+71paxDM+/ayYZChY6V6oeivPbsXjgRsmvqP?= =?us-ascii?Q?ufrPe4BNh8Ejzz/5NJVkpzE21lj5mfIG+VW697SBIpeaZQb8WV+hBLROFRK5?= =?us-ascii?Q?g2l79OAsDe8peLLMg9eUiNeN/uTV7ZKBmKKO75MInSrfTCSlImrT8PR8vYTK?= =?us-ascii?Q?nwbv5ywMWSUqmTq8e29SWnV6225OIbgzY7Lm1AbIKOc6YXRbCNy3qsCfZotY?= =?us-ascii?Q?eIp75hWcz5umlO0+UWmoxnf1ZcrNkhUsSAf17s600Ig26e34PCFF7gfemP4l?= =?us-ascii?Q?02A40SKAF7t82Dt3RFUg8OsjeRahyKd6A5K4fb1oemJQMHmfVCRryU9uHtv6?= =?us-ascii?Q?JgyNg5pye/78eIMMd3toJa/N5zoRH5EUseH3Otd2mYjUXxTSIJcdMOj5ellq?= =?us-ascii?Q?7AKcVeMMEkOGlKPlmVs0x3r5NXi+RqSSjP2MrbmkftrFciMmHllzYcvbH4Np?= =?us-ascii?Q?xDv/tZXq5zzJhb/rbZ6m1Qc5nGWTpSJXxZlvbG6AIAKkNkzhwKpfvYw45wia?= =?us-ascii?Q?J/eHHq5aHiPBQfruLG8QL4UwrmS6U7wRw6ruRICwN8Hc/WwW7z5q3FmAWvL7?= =?us-ascii?Q?x4tQqu4Es5DOcHVkBejnk+MM3/YbV2yB+xMfxOtXCBZs4Bgug6Irm1biQrsv?= =?us-ascii?Q?Tm29si+n7qiMPDhCJSzqRcDj0R0AltptPULB4+6l+UwlKHN/eZ1VEcv/cvoY?= =?us-ascii?Q?Bv8GiFGFVkFJ0lGyStcPAW1NwyHSr4QKox0QuI+bY02du/TIdnV+/ILnruqJ?= =?us-ascii?Q?+Zqbf539aCi1Mm96AMjQjsE8y6QA7E4VVlNpZI+SFaHb8bkBW/+Sg1LoBaRQ?= =?us-ascii?Q?hZSMNSElmV4Rje7w3tN2sX0p8JKVPC58tEe+D5LffU+d4pYN0CgCcJFd9ecw?= =?us-ascii?Q?0D7ZYYmIlV8jpregiFiq6nHxP5MyVXYXE6snc+kmhTPPytsHOYxP2x8qIVr7?= =?us-ascii?Q?Ijxe4RV/0lx/3/wshB9H9srN7nAwae106qPfNMZ8qa6QWzNtgOsVxsYuDW13?= =?us-ascii?Q?Sjdccw/tpHuRA2Kze76HjCHemuzzdkcPIad3ssyF2yXQhBtC3r3XwU4ymqis?= =?us-ascii?Q?aV8qn4dJVUlV4AiKStBEb7r3LGq/nzg3BVUWJjKjBXrMJTryKEcomfNNRhs3?= =?us-ascii?Q?0UceUnb0rH1jxlOltqcuWVfx7+J9fjpfGoht7X126Mk5f0FIVzR3lgU9N8sL?= =?us-ascii?Q?NGlq1WakH6JbkJjyfKx2zUo3VVPJKrsa7y6Fu5rWIJhKMTgzn4rA0JmS2aMs?= =?us-ascii?Q?PoYcjSHvgloRxx8OqsIq4/bgI8SNtc76Ilz8+1cYXZCoseogMw25FjL17PNp?= =?us-ascii?Q?lm4+MB2GrAq/tQkSy1X1jVHZStvufPUH/zgunjQAoh5esN1uQPP5IIuhoxhx?= =?us-ascii?Q?I1TCuRxaeIDNva4AyB5xwVDmgmVCwZU+ytyp1BfOi9na99ysjyXi8mVuJvDF?= =?us-ascii?Q?D5PnZam2S3EZCZhbpODCyN+i6Co=3D?= X-OriginatorOrg: cyberus-technology.de X-MS-Exchange-CrossTenant-Network-Message-Id: a69e6aac-0c35-481d-f239-08dd9db6d4fe X-MS-Exchange-CrossTenant-AuthSource: BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 07:11:14.1837 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f4e0f4e0-9d68-4bd6-a95b-0cba36dbac2e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mYGM/4FBFUW7504eFuYLHorwT1YftNtixrNlITkc01MI8S7CwbLRPpx4iC+QYQ3N/Y5q9K9PLkfkFX9dt3lc9Z+oT2lFvdYH+nCOhhUZziCwC0WjBPbiaWlemDQAn5+R X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEYP281MB4060 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5K6TS6PGKV4URNVQE4M6WICHP3N5KO7D X-Message-ID-Hash: 5K6TS6PGKV4URNVQE4M6WICHP3N5KO7D X-MailFrom: stefan.kober@cyberus-technology.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Stefan Kober X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZM-MESSAGEID: 1748416384654116600 Content-Type: text/plain; charset="utf-8" Allow a user to set the verbosity of the cloud hypervisor instances by specifying it in the ch.conf configuration file. Signed-off-by: Stefan Kober --- src/ch/ch.conf | 8 ++++++++ src/ch/ch_conf.c | 9 +++++++++ src/ch/ch_conf.h | 15 +++++++++++++++ src/ch/ch_monitor.c | 6 ++++++ src/ch/libvirtd_ch.aug | 2 +- src/ch/meson.build | 12 ++++++++++++ src/ch/test_libvirtd_ch.aug.in | 5 +++++ 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/ch/test_libvirtd_ch.aug.in diff --git a/src/ch/ch.conf b/src/ch/ch.conf index 8ce987f675..5e3cf8f92f 100644 --- a/src/ch/ch.conf +++ b/src/ch/ch.conf @@ -1,3 +1,11 @@ # Master configuration file for the QEMU driver. # All settings described here are optional - if omitted, sensible # defaults are used. + +# By default, Cloud Hypervisor only emits warning and error messages. By u= sing +# the log_level configuration option, the logging verbosity can be increas= ed. +# +# Using log_level =3D 1 configures Cloud Hypervisor to also show info mess= ages. +# Using log_level =3D 2 configures Cloud Hypervisor to also show debug mes= sages. +# +#log_level =3D 0 diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 7d3f600707..b9432e2a42 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -98,6 +98,15 @@ int virCHDriverConfigLoadFile(virCHDriverConfig *cfg, if (!(conf =3D virConfReadFile(filename, 0))) return -1; =20 + if (virConfGetValueUInt(conf, "log_level", &cfg->logLevel) < 0) + return -1; + + if (!(cfg->logLevel < VIR_CH_LOGLEVEL_LAST)) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid log_level %1$u"), + cfg->logLevel); + return -1; + } + return 0; } =20 diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h index 2f0d090d35..1660762f2b 100644 --- a/src/ch/ch_conf.h +++ b/src/ch/ch_conf.h @@ -34,6 +34,19 @@ typedef struct _virCHDriver virCHDriver; =20 typedef struct _virCHDriverConfig virCHDriverConfig; =20 +typedef enum { + /* Standard log level only showing warning and error messages. */ + VIR_CH_LOGLEVEL_DEFAULT =3D 0, + + /* Additional info messages are shown. Will not spam the log. */ + VIR_CH_LOGLEVEL_INFO, + + /* Additional debug messages are shown. Will be very verbose. */ + VIR_CH_LOGLEVEL_DEBUG, + + VIR_CH_LOGLEVEL_LAST +} virCHLogLevel; + struct _virCHDriverConfig { GObject parent; =20 @@ -48,6 +61,8 @@ struct _virCHDriverConfig { gid_t group; =20 bool stdioLogD; + + virCHLogLevel logLevel; }; =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCHDriverConfig, virObjectUnref); diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 3d3b4cb87d..6bf877fef3 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -698,6 +698,12 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *c= fg, int logfile) return NULL; } =20 + if (cfg->logLevel =3D=3D VIR_CH_LOGLEVEL_INFO) { + virCommandAddArg(cmd, "-v"); + } else if (cfg->logLevel =3D=3D VIR_CH_LOGLEVEL_DEBUG) { + virCommandAddArg(cmd, "-vv"); + } + virCommandAddArg(cmd, "--api-socket"); virCommandAddArgFormat(cmd, "fd=3D%d", socket_fd); virCommandPassFD(cmd, socket_fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); diff --git a/src/ch/libvirtd_ch.aug b/src/ch/libvirtd_ch.aug index d0b0964987..fa97d2a44a 100644 --- a/src/ch/libvirtd_ch.aug +++ b/src/ch/libvirtd_ch.aug @@ -23,7 +23,7 @@ module Libvirtd_ch =3D let str_array_entry (kw:string) =3D [ key kw . value_sep . str_array_va= l ] =20 (* Config entry grouped by function - same order as example config *) - let config_entry =3D bool_entry "placeholder" + let config_entry =3D int_entry "log_level" =20 (* Each entry in the config is one of the following three ... *) let entry =3D config_entry diff --git a/src/ch/meson.build b/src/ch/meson.build index 0b4a5aeb49..cd20c3d065 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -77,6 +77,18 @@ if conf.has('WITH_CH') ], } =20 + ch_conf =3D files('ch.conf') + virt_conf_files +=3D ch_conf + virt_aug_files +=3D files('libvirtd_ch.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirtd_ch.aug', + 'aug': files('test_libvirtd_ch.aug.in'), + 'conf': ch_conf, + 'test_name': 'libvirtd_ch', + 'test_srcdir': meson.current_source_dir(), + 'test_builddir': meson.current_build_dir(), + } + virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'ch', localstatedir / 'log' / 'libvirt' / 'ch', diff --git a/src/ch/test_libvirtd_ch.aug.in b/src/ch/test_libvirtd_ch.aug.in new file mode 100644 index 0000000000..bddec24b88 --- /dev/null +++ b/src/ch/test_libvirtd_ch.aug.in @@ -0,0 +1,5 @@ +module Test_libvirtd_ch =3D + @CONFIG@ + + test Libvirtd_ch.lns get conf =3D +{ "log_level" =3D "0" } --=20 2.49.0