From nobody Mon Feb 2 07:29:40 2026 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=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1769620490; cv=none; d=zohomail.com; s=zohoarc; b=j0H5ehTDDR2QLxlyoARKnctG7u6u64ro94+rjtt20R3uG9oYuErDX617BKJiyDrxYZBb4dmxGmtqj/3oiJEOkaujXVfWLNZe1qqhdtI0AnFC7Dw/kEsefQ+3lgh056lZ5rM76P9qJNGf83tg/XlsqsQhFmBnULSvDssEvqj/0SI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769620490; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=SOAS8Fl8l73K6SW9BQuvM0bwvt8GyxyAJHlKJO4/U8U=; b=dOILa9j0C5L5Y51iMhUcI5BBrsHgAjp2Hzq6dLeXMayovdMXGT94ECOm299Aus1XMM13l05qsOYELy6A7YDgq71HWgK1oLsY5MWNZRlhnvnU6xaH9bsZQz/funSyR8l6syzbSZ40CT8OTZi1SvgNC3BjrITH6CN6AUpWf3X/29s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1769620490968150.2883630863189; Wed, 28 Jan 2026 09:14:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id B8254418EE; Wed, 28 Jan 2026 12:14:49 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4A49843E0B; Wed, 28 Jan 2026 12:12:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5BEE2418A8; Wed, 28 Jan 2026 12:12:09 -0500 (EST) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E500F4189D for ; Wed, 28 Jan 2026 12:12:08 -0500 (EST) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-65812261842so1820308a12.1 for ; Wed, 28 Jan 2026 09:12:08 -0800 (PST) Received: from tulp.my.domain (2001-1c02-1a15-3000-c218-03ff-feb5-6cc4.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:c218:3ff:feb5:6cc4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8dbf1baa42sm150216266b.46.2026.01.28.09.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 09:12:06 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769620327; x=1770225127; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SOAS8Fl8l73K6SW9BQuvM0bwvt8GyxyAJHlKJO4/U8U=; b=JYth15tMxaOEPAaiRkB0psb6GWGExcYcrDc5ErQGBYfi/sZtaaML0OPJ9Sxtfg1mXO THs1WRwIcFPbJuA5l7CsuFglI+kfNXohgLWPb9XSb40aVZXbIjgOPBW6jYQ+f50TmBpi gwWw7Ar8FLRBBMZEuBVznhMH0OaVgBVqMf6mZ4avekUFvRBQmI11PLNi6V7KWuj7LNO8 NN1T5E623iqrkfXrWgAoluG9Rod1SNQsM1KVjRBw+5tW0GRMLNFjRYlxJF0jpNHxXFP8 NmLnFNMeO9LCC2DcoGSHQZSUd44tA+0otPoWFpgDvUe6Oj9N+wCtCpigEWUmhurMTPuC V7bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769620327; x=1770225127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SOAS8Fl8l73K6SW9BQuvM0bwvt8GyxyAJHlKJO4/U8U=; b=fjGH+wtpmocRx6w94sA9CVaJCmkvOz/m+eDFp/lx3SdfFKteH8HqfbeVdQI9Ba8XFy FapRGYJNpSOx6m+dmT9p6BIbFLC05uW+xnvKBr70i7LOc1/7Te8h+zbvkfXDwLbaMnic QV6/uB+iNhlyQDJM7Y18rKo0TN13FkcXA37/D+g2HvrbRRLNZHZ6w6hid4GitnWUSTzk xETyFZ9W4xRyEaOcXR8nPpCVvOeIQlT6fFxFceFRCU4dn/FGaUZBDaWCpSfkV5XisxpG CXw8/hxSfYMpt29HewrsXs/oTGDyiBiKPUTamakFCnIzQnOp1Oi9HZ5vUcCaZnKJzTW5 Fvlw== X-Gm-Message-State: AOJu0YxbWpe4Zkzlwp7CR9AmYzD3h5B2GXeLTjz3T9/xxnaiBduBe2ih hx86NUvtWnaAtsUFvxi6EjaYAXOv7c15jW2Dn3AcJhHKobm6skkr9Byzp6dWdxAu X-Gm-Gg: AZuq6aIj48652ur0ElPID2rrBiGshuC1MBwoTVrk+BNEbLlfKX5oFlikQUekbo/nLjY JRUmTDITYJP3Nd1JXQ00c5k/kLjt7y9xks5ZApifcTuzNqyH/9k36R2nH/J7F77TVRgzNokosbj ZzPOBX7lrBOhSV2OZr4OerQi9tbPSuk19PMwgaa/IyTSEANOWU8wmsI7RLNYxS2o9dzc9Ym0sh0 YqPBz4ls/1jjPqqJBXnT0TWk3tHWA3FH32pXkfc+TsqUpEv6yZecl8U4zSPgUctCwnhc0w8mLmF 7hO/0wPXGQg3GMdjkxeewCO8WwG73kwZkeSN85QRz55BsMFKeKLLYXed6CD/LRq2si7unBme6nU M73HNLVvqH4owTWiMeMTOiHmZuRx3nGb6c7jdcBz5laQK/tRlgtIPqhxbtGKYiR9huzfzBgATze WilTMvO6TDs/PYxR6R66iYZqdfewZmDksRzAChZg8D/vB1Ov9+mSNLBOol/+UX2CcP7ipV1Occ9 JNpuc+9Z3c5sLahY/JKk1uP X-Received: by 2002:a17:907:7293:b0:b88:51cb:fd65 with SMTP id a640c23a62f3a-b8ddf804f8emr10862666b.3.1769620327066; Wed, 28 Jan 2026 09:12:07 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] bhyve: conf: do not hardcode datadir in bhyve.conf Date: Wed, 28 Jan 2026 18:11:42 +0100 Message-ID: <20260128171142.31492-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128171142.31492-1-bogorodskiy@gmail.com> References: <20260128171142.31492-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RQWNAB2GMITKGL37LBGOKEKWRTUZPGQ3 X-Message-ID-Hash: RQWNAB2GMITKGL37LBGOKEKWRTUZPGQ3 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1769620493350154100 Content-Type: text/plain; charset="utf-8" Do not hardcode "/usr/local/share" directory in the configuration file for the firmware and uboot paths. Use meson's configure_file()/configuration_data() to substitute it with the "datadir" value. Signed-off-by: Roman Bogorodskiy --- src/bhyve/{bhyve.conf =3D> bhyve.conf.in} | 4 ++-- src/bhyve/meson.build | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) rename src/bhyve/{bhyve.conf =3D> bhyve.conf.in} (87%) diff --git a/src/bhyve/bhyve.conf b/src/bhyve/bhyve.conf.in similarity index 87% rename from src/bhyve/bhyve.conf rename to src/bhyve/bhyve.conf.in index a845937d87..5ed6a14db5 100644 --- a/src/bhyve/bhyve.conf +++ b/src/bhyve/bhyve.conf.in @@ -4,12 +4,12 @@ =20 # Path to a directory with firmware files. By default it's pointing # to the directory that sysutils/bhyve-firmware installs files into. -#firmware_dir =3D "/usr/local/share/uefi-firmware" +#firmware_dir =3D "@DATADIR@/uefi-firmware" =20 # Path to the U-Boot loader for the arm64 guests. # By default it's pointing to the loader installed # by the sysutils/u-boot-bhyve-arm64 port -#uboot_path =3D "/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin" +#uboot_path =3D "@DATADIR@/u-boot/u-boot-bhyve-arm64/u-boot.bin" =20 # Set timeout for the bhyveload(8) command. This might be necessary # because in case of errors bhyveload(8) drops to an interactive diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 11920d9c3e..564b7e5db2 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -50,12 +50,21 @@ if conf.has('WITH_BHYVE') ], } =20 - virt_conf_files +=3D files('bhyve.conf') + bhyve_conf_data =3D configuration_data({ + 'DATADIR': datadir, + }) + bhyve_conf =3D configure_file( + input: 'bhyve.conf.in', + output: 'bhyve.conf', + configuration: bhyve_conf_data, + ) + + virt_conf_files +=3D bhyve_conf virt_aug_files +=3D files('libvirtd_bhyve.aug') virt_test_aug_files +=3D { 'name': 'test_libvirtd_bhyve.aug', 'aug': files('test_libvirtd_bhyve.aug.in'), - 'conf': files('bhyve.conf'), + 'conf': bhyve_conf, 'test_name': 'libvirtd_bhyve', 'test_srcdir': meson.current_source_dir(), 'test_builddir': meson.current_build_dir(), --=20 2.52.0