diff options
| author | Andrea Bolognani <abologna@redhat.com> | 2023-05-10 19:58:23 +0200 |
|---|---|---|
| committer | Andrea Bolognani <abologna@redhat.com> | 2023-05-11 15:04:54 +0200 |
| commit | 4400f63636fc279350ec9d8461772d0229dffe85 (patch) | |
| tree | 948223d25d97610aed51cf38e136b4036b9fb770 | |
| parent | 769de39f50da88542181c406aef16ce84dd584da (diff) | |
| download | libvirt-4400f63636fc279350ec9d8461772d0229dffe85.tar.gz | |
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 <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
| -rw-r--r-- | meson.build | 12 | ||||
| -rw-r--r-- | src/qemu/qemu_conf.c | 1 |
2 files changed, 1 insertions, 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, |