[PATCH 04/20] util: stop hardcoding bhyve, bhyvectl, bhyveload paths
From: Daniel P. Berrangé <berrange(a)redhat.com>
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é <berrange(a)redhat.com>
---
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
if not get_option('driver_bhyve').disabled() and host_machine.system() ==
'freebsd'
- bhyve_prog = find_program('bhyve', required:
get_option('driver_bhyve'))
- bhyvectl_prog = find_program('bhyvectl', required:
get_option('driver_bhyve'))
- bhyveload_prog = find_program('bhyveload', required:
get_option('driver_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 = virCommandNew(BHYVE);
+ g_autoptr(virCommand) cmd = virCommandNew("bhyve");
size_t i;
unsigned nusbcontrollers = 0;
unsigned nisacontrollers = 0;
@@ -884,7 +884,7 @@ virCommand *
virBhyveProcessBuildDestroyCmd(struct _bhyveConn *driver G_GNUC_UNUSED,
virDomainDef *def)
{
- virCommand *cmd = virCommandNew(BHYVECTL);
+ virCommand *cmd = virCommandNew("bhyvectl");
virCommandAddArg(cmd, "--destroy");
virCommandAddArgPair(cmd, "--vm", def->name);
@@ -907,7 +907,7 @@ virBhyveProcessBuildBhyveloadCmd(virDomainDef *def, virDomainDiskDef
*disk)
{
virCommand *cmd;
- cmd = virCommandNew(BHYVELOAD);
+ cmd = virCommandNew("bhyveload");
if (def->os.bootloaderArgs == NULL) {
VIR_DEBUG("bhyveload with default arguments");
--
2.49.0