From 4400f63636fc279350ec9d8461772d0229dffe85 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 10 May 2023 19:58:23 +0200 Subject: [PATCH] meson: Stop looking for dbus-daemon Now that we're performing the lookup at runtime, doing it at build time is no longer necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- meson.build | 12 ------------ src/qemu/qemu_conf.c | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 6e65e9eec3..a99a2a260b 100644 --- a/meson.build +++ b/meson.build @@ -1666,18 +1666,6 @@ if not get_option('driver_qemu').disabled() qemu_slirp_path = '/usr/bin/slirp-helper' endif conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path) - - qemu_dbus_daemon_prog = find_program( - 'dbus-daemon', - dirs: [ '/usr/bin', '/usr/libexec' ], - required: false - ) - if qemu_dbus_daemon_prog.found() - qemu_dbus_daemon_path = qemu_dbus_daemon_prog.full_path() - else - qemu_dbus_daemon_path = '/usr/bin/dbus-daemon' - endif - conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path) endif endif diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c76ae7ac93..bd984448a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -99,6 +99,7 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); #define QEMU_BRIDGE_HELPER "qemu-bridge-helper" #define QEMU_PR_HELPER "qemu-pr-helper" +#define QEMU_DBUS_DAEMON "dbus-daemon" virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged,