From nobody Tue Sep 9 09:45:38 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; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1745925405; cv=none; d=zohomail.com; s=zohoarc; b=WaVJO7TWjMp4r8RGrb+cpbNmcd3PJkdqf4+FONseF1re/w1XrqO/Ld+xsPyI/qV/TEc01a1T6WZ0/yvyiiCDAY33EHsLkZPdPvnzvuu2rlryspQ6nmP8bCejJnOgUM+7uoMX6LTAgC2pMcz5iYAVCiOgDmXpa0Xjn+5hnG89D6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745925405; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=PvVuwpZUAKStBnAKM747BgJBOCo4232TUI+Od6ttH8I=; b=Cb90s7+UUngQei/GKLMLZgLyvpTdTYTqdMQWe70lLDf6c6I1b3fHU9eoRCpMAqB29uAuzLzv0O5LZZv2IgMbZTfkhdrd2VQmeMOQIM9RD8H6XpQn6U0uAG0BMpWSbuwPPuKOG9TBsrOmtY2oudM/rRL+KVrQAc+lCNOTIf1IP00= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1745925405588823.4135689973397; Tue, 29 Apr 2025 04:16:45 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 94A4712CF; Tue, 29 Apr 2025 07:16:44 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2D4EF1410; Tue, 29 Apr 2025 07:14:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4EE5411C8; Tue, 29 Apr 2025 07:14:30 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 C7F3911C8 for ; Tue, 29 Apr 2025 07:14:29 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-296-7NujNy5GPwGv21YRnDbQ0w-1; Tue, 29 Apr 2025 07:14:28 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54BE9180034A for ; Tue, 29 Apr 2025 11:14:27 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.98]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 73504195608D; Tue, 29 Apr 2025 11:14:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745925269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aGju6+OUmC9INZYqGMJY9W+Cl5dWl4BqFnOvkGS5kqA=; b=P2+2pmjpD+Is8TXQSnUa1n7pVHMYsG3dlb+EgPwscYihhBFcIjbHuEDHOiAfLaiuD8whtU 9YOLerQL7SyRwgac020W6VrPpMmYFa0+5zbihCjSxRbK1tuyHpfVKnQzYzEUGcr/qXO7sl QUz0w751p4hyV3hpUHBJ39MobtKrngQ= X-MC-Unique: 7NujNy5GPwGv21YRnDbQ0w-1 X-Mimecast-MFC-AGG-ID: 7NujNy5GPwGv21YRnDbQ0w_1745925267 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 04/20] util: stop hardcoding bhyve, bhyvectl, bhyveload paths Date: Tue, 29 Apr 2025 12:14:04 +0100 Message-ID: <20250429111420.1748521-5-berrange@redhat.com> In-Reply-To: <20250429111420.1748521-1-berrange@redhat.com> References: <20250429111420.1748521-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ZuWXgyIomDEkbeUoH8E35HjldeevHFzIycUzFIcUwVQ_1745925267 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FQEY6YMWAPQUG65ROYGOEI6PS5LEGY42 X-Message-ID-Hash: FQEY6YMWAPQUG65ROYGOEI6PS5LEGY42 X-MailFrom: berrange@redhat.com 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 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1745925407790019100 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 Change the meson rules to always enable numad if on a FreeBSD host, unless the meson options say not to. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- meson.build | 11 +---------- src/bhyve/bhyve_command.c | 6 +++--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 767205f44b..b0b6efee8e 100644 --- a/meson.build +++ b/meson.build @@ -1495,16 +1495,7 @@ if not get_option('driver_libvirtd').disabled() endif =20 if not get_option('driver_bhyve').disabled() and host_machine.system() =3D= =3D 'freebsd' - bhyve_prog =3D find_program('bhyve', required: get_option('driver_bhyve'= )) - bhyvectl_prog =3D find_program('bhyvectl', required: get_option('driver_= bhyve')) - bhyveload_prog =3D find_program('bhyveload', required: get_option('drive= r_bhyve')) - - if bhyve_prog.found() and bhyvectl_prog.found() and bhyveload_prog.found= () - conf.set('WITH_BHYVE', 1) - conf.set_quoted('BHYVE', bhyve_prog.full_path()) - conf.set_quoted('BHYVECTL', bhyvectl_prog.full_path()) - conf.set_quoted('BHYVELOAD', bhyveload_prog.full_path()) - endif + conf.set('WITH_BHYVE', 1) elif get_option('driver_bhyve').enabled() error('The bhyve driver cannot be enabled') endif diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6578a4326c..44c66ea147 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -711,7 +711,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver,= virDomainDef *def, * -S 31,uart,stdio \ * vm0 */ - g_autoptr(virCommand) cmd =3D virCommandNew(BHYVE); + g_autoptr(virCommand) cmd =3D virCommandNew("bhyve"); size_t i; unsigned nusbcontrollers =3D 0; unsigned nisacontrollers =3D 0; @@ -884,7 +884,7 @@ virCommand * virBhyveProcessBuildDestroyCmd(struct _bhyveConn *driver G_GNUC_UNUSED, virDomainDef *def) { - virCommand *cmd =3D virCommandNew(BHYVECTL); + virCommand *cmd =3D virCommandNew("bhyvectl"); =20 virCommandAddArg(cmd, "--destroy"); virCommandAddArgPair(cmd, "--vm", def->name); @@ -907,7 +907,7 @@ virBhyveProcessBuildBhyveloadCmd(virDomainDef *def, vir= DomainDiskDef *disk) { virCommand *cmd; =20 - cmd =3D virCommandNew(BHYVELOAD); + cmd =3D virCommandNew("bhyveload"); =20 if (def->os.bootloaderArgs =3D=3D NULL) { VIR_DEBUG("bhyveload with default arguments"); --=20 2.49.0