Re: [PATCH 16/20] util: remove use hardcoded TC path

From: Daniel P. Berrangé <berrange(a)redhat.com&gt; Allow virCommand to find 'tc' in $PATH. This command is only used when running privileged in which case both 'bin' and 'sbin' dirs will be in $PATH, so virFindFileInPath will do the right thing to find it. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- meson.build | 10 ++---- src/util/virfirewall.h | 1 + src/util/virnetdevbandwidth.c | 36 ++++++++++----------- tests/virnetdevbandwidthtest.c | 58 +++++++++++++++++----------------- 4 files changed, 50 insertions(+), 55 deletions(-) diff --git a/meson.build b/meson.build index 0515820cdd..4223f5ab86 100644 --- a/meson.build +++ b/meson.build @@ -845,7 +845,7 @@ endforeach # optional programs -optional_test_programs = [ +optional_programs = [ 'augparse', 'black', 'flake8', @@ -853,10 +853,6 @@ optional_test_programs = [ 'pytest', ] -optional_programs = [ - 'tc', -] + optional_test_programs - missing_optional_programs = [] foreach name : optional_programs prog = find_program(name, required: false, dirs: libvirt_sbin_path) @@ -865,9 +861,7 @@ foreach name : optional_programs prog_path = prog.full_path() else prog_path = name - if name in optional_test_programs - missing_optional_programs += [ name ] - endif + missing_optional_programs += [ name ] endif

conf.set_quoted(varname.to_upper(), prog_path) diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index d42e60884b..07391bea67 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -30,6 +30,7 @@ #define IPTABLES "iptables" #define IP6TABLES "ip6tables" #define NFT "nft" +#define TC "tc"