External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Stop looking for QEMU helpers

Browse Source 
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: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-04-25 16:30:44 +02:00
parent 934113d376
commit b134a9bd2a
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meson.build
View File

@ -1655,30 +1655,6 @@ if not get_option('driver_qemu').disabled()
conf.set_quoted('QEMU_USER', qemu_user)
conf.set_quoted('QEMU_GROUP', qemu_group)
qemu_bridge_prog = find_program(
'qemu-bridge-helper',
dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
required: false
)
if qemu_bridge_prog.found()
qemu_bridge_path = qemu_bridge_prog.full_path()
else
qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
endif
conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
qemu_pr_prog = find_program(
'qemu-pr-helper',
dirs: [ '/usr/bin', '/usr/libexec' ],
required: false
)
if qemu_pr_prog.found()
qemu_pr_path = qemu_pr_prog.full_path()
else
qemu_pr_path = '/usr/bin/qemu-pr-helper'
endif
conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path)
qemu_slirp_prog = find_program(
'slirp-helper',
dirs: [ '/usr/bin', '/usr/libexec' ],

4
src/qemu/qemu_conf.c
View File

@ -97,6 +97,10 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
#endif
#define QEMU_BRIDGE_HELPER "qemu-bridge-helper"
#define QEMU_PR_HELPER "qemu-pr-helper"
virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged,
const char *root)
{