openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andrea Bolognani 2023-05-10 19:58:23 +02:00
parent 769de39f50
commit 4400f63636
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -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

1
src/qemu/qemu_conf.c
View File

@ -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,