From nobody Tue Sep 9 23:41:31 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 1748333533759918.0110944498307; Tue, 27 May 2025 01:12:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CD58C13DE; Tue, 27 May 2025 04:12:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F1D63115; Tue, 27 May 2025 04:10:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 958F41399; Tue, 27 May 2025 04:10:50 -0400 (EDT) Received: from FR4P281CU032.outbound.protection.outlook.com (mail-germanywestcentralazon11022123.outbound.protection.outlook.com [40.107.149.123]) (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 516FF13A9 for ; Tue, 27 May 2025 04:10:49 -0400 (EDT) Received: from BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:46::5) by BE1P281MB1505.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.27; Tue, 27 May 2025 08:10:45 +0000 Received: from BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM ([fe80::7272:f32d:eb8d:e401]) by BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM ([fe80::7272:f32d:eb8d:e401%4]) with mapi id 15.20.8769.025; Tue, 27 May 2025 08:10:45 +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=bqCnkMm2CJcpFhFNjbGe7rNO/PgJpXX+KbGOXv5hi6CPIGyZ9kTRFD6NvdciIYR2MY31MHADzqN6n4RscjgdOZ5fszlRFnJS8KqoERDnCs+IQAGHpid8ohOKjZcS47Qgyoh0Ng4Im8UteYaU/RZ0sP6vYaTObu/uPzyYbWFc2Y21IGyO2gH3Z5lKeK/wn9oKJhtqMrKzG4nCFhNiPgLXDyyLviZIVdTH/yB2s9STgr+w+ypb2mTkiEwiKZrq92usaLety560Ri1zBmciTjwobuEIDRdmMQstP6JfLvlsTgHyfQgfqFccchWDLrJF/R/6jTQPUOUwSWc20f0ACCcaBA== 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=OnV1Ynd3lqNkEq2H9L/KKfNra95bS/5JxakVibV8Z3Q=; b=Kz+VfDluCWuoaP0oD31KoaH8LlfwFA9lDtKCBwelGienQ0dtwyjD+18C8uJ8VXTw+hU3odGbwDHhDFSL5VGEzP3M4TxdHZ/1vlRkCgw/pJhvF97V9iWesL14QfzO48hSbVHXtegpFKwsQRHq5Snra/ERoCa3X5C02D7E6QMf1kZvHG8Ht297DxkPRe8wlv/38y92uaqi/COL1eeFi2+Q8KZKb6t3yS9M5j0fIjAqLJeBBDwwwSu6zQBt/5+7FebPhpUyxmZgDrYuAPgZWItW7d4X4sXCmBWLbyDVvWKRk1+Xux07f3d5yAqeqFs3FQyoArHh/hvMwcbzYp5/YA2V3g== 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=OnV1Ynd3lqNkEq2H9L/KKfNra95bS/5JxakVibV8Z3Q=; b=pcy2zaVipsjYbufR3OQqq75ZNWwkxCt48EK6zP1aLyDY/qDwxIbGzNNuBeCWPwQmlU+e7vZKqSPykuqDvPiG0yYvZhMyZ3fQT0eNQ8GjbbH5LYkCbpr50D+rZKko9auXHzEofKEWiX0rXLYBAgL9iFk26O1vwYlDf5pYd9r0z2nMug6WJ78Hm6mYmD/HafyEpm3bVBSdBLWWzNwgMfj8WN59maNft8/t1HZiasdrgrUTb8+GSnWpuVtcd710SOGWMPSkUz0zpIqmDlbtx7KsxX7qlCiIdVBAephzX47bjnlYyYi7+kjphPuEj7rH/bf4L+S0wCUMS24mM+hDyVx+HQ== 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 v2 2/3] ch: add log level configuration option Date: Tue, 27 May 2025 10:10:33 +0200 Message-ID: <20250527081034.255383-3-stefan.kober@cyberus-technology.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527081034.255383-1-stefan.kober@cyberus-technology.de> References: <20250527081034.255383-1-stefan.kober@cyberus-technology.de> X-ClientProxiedBy: FR3P281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::8) To BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:46::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BEZP281MB1973:EE_|BE1P281MB1505:EE_ X-MS-Office365-Filtering-Correlation-Id: c1bdfe73-8e91-4d3b-d6d4-08dd9cf5faca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gy9qGovME+APnq6dkSEPWP66l4scxDvM6Gl/3+dqvVGAgsX4opTK6Vm/Gj48?= =?us-ascii?Q?PgEnFunKIX7EAtfQZegpWvnSFrK6gMvtLf11gdmwqrpLSu9lFWgRH7Yh7zFS?= =?us-ascii?Q?V5jKakLNy12Cw1QKfQ/nAidm35SJzY7L6gO15hqYFsh5EXRxf/roS70Z4hiL?= =?us-ascii?Q?BmsuHh9A8pexPQX+YTzyv5umise+OIZjx79xiZ6ECoctEi0g/lAsZyXIuyGd?= =?us-ascii?Q?yGhS4kT0ptAQgsRHYbvF0VhcaxIB/K4LSc+eUp4+0U/Jr0wD8EXWsXkXZhkN?= =?us-ascii?Q?nL6Y9HhlV0tVK3ZpaQQz6JbE5Zt+Kz8PADtVYU3WfUAKEB7L+zSh24QcNZzH?= =?us-ascii?Q?tS/HUPA8eTm8EwKvG4WC7+5qQtcOR/n2chA7F/Jf6Emvr8PwM9zMMuZhW8wZ?= =?us-ascii?Q?ZBvuY+Wvq3iR8HTV2jURSUJbmVY02nxX4u/YtbXS839oNqwbxJz+jNX1W1Pm?= =?us-ascii?Q?L0xxm7BJ7XDY2wxdFCiSdkSk2eR/wOXg432giS6Zxh7LwkoNWqlWnlvO/EgM?= =?us-ascii?Q?JAVdl9b6qeMn/PeLLG5ZBbmURoum7l3CVt09xPz1sHg0ltpfS+Trph00FwTz?= =?us-ascii?Q?o7uSjTUapPI0YSA4z5DAdL7kFcRvYgLWGUYvyLxtVFYjwA29IsedJAnDQH79?= =?us-ascii?Q?CsqOCTHr821hg6RvJVFHH2qZzN5cLbLe7j2GUBlHbSc9RHLEuBIpLXw0CImb?= =?us-ascii?Q?klQmJlHhLbVzrBF8tioq091a2ql3BO+POZiPnKUW+lgOqVNCXz33OoVGGtK/?= =?us-ascii?Q?U01ULOgl4FtMP3KNJM7A8o8JUt0yZ6Vi/c/WoExzmOLoJO2lr8t6J8CEHCE7?= =?us-ascii?Q?jSnjQhaFTF22Grb26INPOOPanOtOmG403DmqBF7L2EUVHy6HmKfMmWGcvXeg?= =?us-ascii?Q?5/XeMlgy02PMHS3omNPMIiA8s0Dr3maSP8WSZweljEtNG3D3+NR+x5FGDNKv?= =?us-ascii?Q?aF8FxmqXaemPYUNQqb4lRmgGq9wwrGNWttPVl0BqLbc/tOkUv4yjRas9sl8W?= =?us-ascii?Q?sFVdwbZOfx66wF6cz87J1VDwChkIE7edjwpp9rS74ppEYH3hvLosRsDowW/Y?= =?us-ascii?Q?EIRy3QvsThANcml5cNej06mC6OPILbaAqBuEr7xdRLGc5kQmPXrp7zSQIRtK?= =?us-ascii?Q?NS8m36IBaXlZNCeRvUVixltYM46tHt45C7WA/aoD5+lJ5Yon3SzxvdnMUHHl?= =?us-ascii?Q?iBbWIAOB4hfiEu+RfJrUnneyJOQCQxWJk6u11vQSiWG7EtBhHTwpDtGaHW6/?= =?us-ascii?Q?S/LhEH5jzHqPWmn6UWzwbEwge0O4jVtzv7znBq7GbHiyQ2O/nMdxj621iqla?= =?us-ascii?Q?bHQ3tIIaLS8z3+hU5BEP6+8+BSRR72uxYyPVQySHyIUH5gBacYuAq71cgNt2?= =?us-ascii?Q?47mkz2PXq/6K1fLyZuS+csCvdQdqSE4dx5Rp4sz73+ZMrexXuvAQhKxoKaSQ?= =?us-ascii?Q?3JaLd2I/UFg=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)(366016)(376014)(10070799003)(1800799024);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d2qLLFrPYT/nHfy9y8jreZcEz4WB8UYIf3KruQch23/pwe387Q9LfgvfaRIX?= =?us-ascii?Q?1tYHYdD86IBDdOyx4nvAPE71UyLBSb+56qrq+/e7D6DBWwR+XG6OlazzgS8/?= =?us-ascii?Q?SBDr8ZHo7Axql0acUPbnrgnf2lgZyBOwZYVoIgiOacxl0gHSZHD5RC3TdOh3?= =?us-ascii?Q?hX3D27eEhsuWc5noTZ8AQFNDiFa3t+44EyMZX2FeriBeW25XdSLrj8WRcKv3?= =?us-ascii?Q?j1IsDEWqX4VycJ6jJz0DUDqfW/UvfA3SYz0m/49WdKKw68b5VBHN/fQfrv7t?= =?us-ascii?Q?X1D5cF68fsk3xNQ8caWZut8mHn2eTV5HAbJpa3h6uCd/5JVXWrEv+YcM/X53?= =?us-ascii?Q?0fZqeorcfLL3Bn9nZcjTSod8eDiNF5Pi0rvLUCYLiHgNjCrc/Phj0TornA7/?= =?us-ascii?Q?X/Oez9ERm9Vxj4R4n7JBRWuF9FHTM60dRWa+hy+WyjVxiVl8Misr28U9RP24?= =?us-ascii?Q?l6o4RjvqDjYdGe3NYkGjua412qBtqnuiML1x9LiiNFf5SQvQX1p8zLoFs7Rj?= =?us-ascii?Q?IjoXxI5RxK2Yj4R+mZFLtcK7U2SxKlvHx8dskQ3cye13yMR5kgVVF2QYoJ/8?= =?us-ascii?Q?eBZ1imzWkk+k/j0HPYIN9UJQBClvg2DhnFGWsQCrQ9irffsiBHJ3SUa8xr0v?= =?us-ascii?Q?GeJ7KylUUAorR+Yjw2fRwjTR4DCu9Cz8UAyPNbQ5H7UbqWNhznQWBE5Gk/do?= =?us-ascii?Q?3ISLqTyjMM+u0yv0+8g+RvzGupmiHOkp0CNv5TF/uVTJDaHKcRsJ9cXGfq7o?= =?us-ascii?Q?pi3AHU4acd+5QJ6BgmTlIoS8TEjNuzAKBLB/hEM29CZYXJVG2nMSCQQ4a0m7?= =?us-ascii?Q?RtBoZDEWaDoVh3hAQEWBIwTFyiBk3Yo/kJtgKDdkQnFavKJMKGEqK6pWLllD?= =?us-ascii?Q?Vs0/kEmAeuM0/KcB/Dv0rHjcEenbWxQcXelVei2JmEx+rWizLB//H5yTLvCz?= =?us-ascii?Q?BoyIZ+TvzgpgJFjATma+8zkPh6Rpttqr0KeCLCdtMQiiIBHQbOomt9JWMk2x?= =?us-ascii?Q?n7kwWUVcFMsQBYEy0STnYivgh0YP3Bu641Ad8PWALWSQj4qk5ZVarZITi79C?= =?us-ascii?Q?Dnottv63G7ozDVG+30HYuAlkh/F53f6mSfZ+Ay+W5Otrt86Tcyf18ZPp294K?= =?us-ascii?Q?nicKnwETHCiUT8IC6W6pAQDbsuiHF8RZ7G93tRlXVpDO94fB2gdrfIXPJwKp?= =?us-ascii?Q?GsUOo1jXaCvUnPpM8bZ5Fk5NLROMdRnO3bDDcZq6NOXlkeQaMSWQqkoN4sP6?= =?us-ascii?Q?+T3UzZn/Km/zdfCoNVZ++StoVWBMXcnwfL7i2qtWn0UZaXVq6rSB2XKzYw4u?= =?us-ascii?Q?5OIRaHBwnfxOees1/p4bWr5Rwlt7uIMLcME4pBEYzgmMSPijjFTgy1kt7wrI?= =?us-ascii?Q?ltskGi2YFSC90adks/6SSNtdhViQjYYNT0/8d1Hn7FStlyDIzJ+Zu3G301Xq?= =?us-ascii?Q?Qh8BXaCqC36ilkuzo2yQPmKIgZ1V11MImFDOalJh/amCUT37+oSDMeB1KtVq?= =?us-ascii?Q?QSdhYAInvq5rb7cXY/I11cr9vYSiKwNqq1hnd7cRAqehBbJwJNow5VN7AIai?= =?us-ascii?Q?QS3VkOE5KVeqvn/mjF5m1wzvN3B0SaKDxdEh12/hI3oGaoKPoqCt6PHqWm0A?= =?us-ascii?Q?mZSbcOd2RCOYhaFTrPpol97IU2A4+8JoVnxupSzyXp3fUhYyKkwRDC1btaFW?= =?us-ascii?Q?YpfL5IJ6JgeQ/Qq4O+47+QWPFuM=3D?= X-OriginatorOrg: cyberus-technology.de X-MS-Exchange-CrossTenant-Network-Message-Id: c1bdfe73-8e91-4d3b-d6d4-08dd9cf5faca X-MS-Exchange-CrossTenant-AuthSource: BEZP281MB1973.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2025 08:10:44.6745 (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: +Nhb9hMfLPpeV5DJZ1hbhHlEyfosJHEHNo/cTSgCLZFaG396MRHfM04RpFLBjyQDZjvAyb1tqYw55jrd0Z19PdxKuRpMwiY1gDAUPVU/d8y4nWk8fNMwm9xPGeXHzKex X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE1P281MB1505 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CHMKLGINWPW6QJ7JFTUFKM7OUVKPZYEP X-Message-ID-Hash: CHMKLGINWPW6QJ7JFTUFKM7OUVKPZYEP 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: 1748333535199116600 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. --- 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