[PATCH 0/3] meson: Misc tweaks
Pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/370312403 Michal Prívozník (3): lib: Use $PROG instead of $PROG_PATH meson: Don't set $PROG_PATH macros meson: Enable ZFS storage backend more often meson.build | 24 +++++----- src/util/virfirewall.c | 8 ++-- src/util/virnetdevip.c | 14 +++--- tests/virfirewalltest.c | 98 ++++++++++++++++++++--------------------- 4 files changed, 71 insertions(+), 73 deletions(-) -- 2.32.0
Due to the way we detect programs at runtime there's no difference between $PROG and $PROG_PATH macros that come from meson-config.h. Either both are set to the path found during configure or both are set to just "$prog", e.g.: #define EBTABLES "/sbin/ebtables" #define EBTABLES_PATH "/sbin/ebtables" #define FLAKE8 "flake8" #define FLAKE8_PATH "flake8" Change those few places which use _PATH. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virfirewall.c | 8 ++-- src/util/virnetdevip.c | 14 +++--- tests/virfirewalltest.c | 98 ++++++++++++++++++++--------------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 9594192a7b..fb02992912 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -42,9 +42,9 @@ typedef struct _virFirewallGroup virFirewallGroup; VIR_ENUM_DECL(virFirewallLayerCommand); VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, - EBTABLES_PATH, - IPTABLES_PATH, - IP6TABLES_PATH, + EBTABLES, + IPTABLES, + IP6TABLES, ); struct _virFirewallRule { @@ -99,7 +99,7 @@ static int virFirewallValidateBackend(virFirewallBackend backend) { const char *commands[] = { - IPTABLES_PATH, IP6TABLES_PATH, EBTABLES_PATH + IPTABLES, IP6TABLES, EBTABLES }; size_t i; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 0ce8f5b536..2eacb64ebe 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -394,8 +394,8 @@ virNetDevIPAddrAdd(const char *ifname, return -1; } -# ifdef IFCONFIG_PATH - cmd = virCommandNew(IFCONFIG_PATH); +# ifdef IFCONFIG + cmd = virCommandNew(IFCONFIG); virCommandAddArg(cmd, ifname); if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) virCommandAddArg(cmd, "inet6"); @@ -408,7 +408,7 @@ virNetDevIPAddrAdd(const char *ifname, virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArg(cmd, "alias"); # else - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew(IP); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (peerstr) @@ -435,8 +435,8 @@ virNetDevIPAddrDel(const char *ifname, if (!(addrstr = virSocketAddrFormat(addr))) return -1; -# ifdef IFCONFIG_PATH - cmd = virCommandNew(IFCONFIG_PATH); +# ifdef IFCONFIG + cmd = virCommandNew(IFCONFIG); virCommandAddArg(cmd, ifname); if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) virCommandAddArg(cmd, "inet6"); @@ -445,7 +445,7 @@ virNetDevIPAddrDel(const char *ifname, virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArg(cmd, "-alias"); # else - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew(IP); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); @@ -473,7 +473,7 @@ virNetDevIPRouteAdd(const char *ifname, return -1; if (!(gatewaystr = virSocketAddrFormat(gateway))) return -1; - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew(IP); virCommandAddArgList(cmd, "route", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index ac039f3bbf..c6f4ca05e2 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -116,11 +116,11 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync, if (fwBuf) { if (STREQ(type, "ipv4")) - virBufferAddLit(fwBuf, IPTABLES_PATH); + virBufferAddLit(fwBuf, IPTABLES); else if (STREQ(type, "ipv6")) - virBufferAddLit(fwBuf, IP6TABLES_PATH); + virBufferAddLit(fwBuf, IP6TABLES); else - virBufferAddLit(fwBuf, EBTABLES_PATH); + virBufferAddLit(fwBuf, EBTABLES); } while (g_variant_iter_loop(iter, "s", &item)) { @@ -186,8 +186,8 @@ testFirewallSingleGroup(const void *opaque) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -239,8 +239,8 @@ testFirewallRemoveRule(const void *opaque) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; virFirewallRule *fwrule; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -299,10 +299,10 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n" + IPTABLES " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -387,10 +387,10 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -456,10 +456,10 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -524,8 +524,8 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -585,11 +585,11 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -666,10 +666,10 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -750,14 +750,14 @@ testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.127 --jump REJECT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n" + IPTABLES " -w -A INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source 192.168.122.127 --jump REJECT\n" + IPTABLES " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n" + IPTABLES " -w -D INPUT --source 192.168.122.255 --jump REJECT\n" + IPTABLES " -w -D INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); @@ -892,11 +892,11 @@ testFirewallQueryHook(const char *const*args, int *status G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { - if (STREQ(args[0], IPTABLES_PATH) && + if (STREQ(args[0], IPTABLES) && STREQ(args[1], "-w") && STREQ(args[2], "-L")) { *output = g_strdup(TEST_FILTER_TABLE_LIST); - } else if (STREQ(args[0], IPTABLES_PATH) && + } else if (STREQ(args[0], IPTABLES) && STREQ(args[1], "-w") && STREQ(args[2], "-t") && STREQ(args[3], "nat") && @@ -943,15 +943,15 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -w -L\n" - IPTABLES_PATH " -w -t nat -L\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.130 --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.129' --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.129' --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source 192.168.122.128 --jump REJECT\n" - IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; + IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES " -w -A INPUT --source 192.168.122.127 --jump REJECT\n" + IPTABLES " -w -L\n" + IPTABLES " -w -t nat -L\n" + IPTABLES " -w -A INPUT --source 192.168.122.130 --jump REJECT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.129' --jump REJECT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.129' --jump REJECT\n" + IPTABLES " -w -A INPUT --source 192.168.122.128 --jump REJECT\n" + IPTABLES " -w -A INPUT --source '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); -- 2.32.0
Now, that there is no user of $PROG_PATH macros the meson script can be changed so that it doesn't set those macros. It's redundant as $PROG macro contains the same value. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index 9d493ccd9e..77ee60977d 100644 --- a/meson.build +++ b/meson.build @@ -802,7 +802,6 @@ foreach name : required_programs prog = find_program(name, dirs: libvirt_sbin_path) varname = name.underscorify() conf.set_quoted(varname.to_upper(), prog.path()) - conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog.path()) set_variable('@0@_prog'.format(varname), prog) endforeach @@ -848,7 +847,6 @@ foreach name : optional_programs endif conf.set_quoted(varname.to_upper(), prog_path) - conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog_path) set_variable('@0@_prog'.format(varname), prog) endforeach -- 2.32.0
Currently, the ZFS storage backend is enabled only if both zfs and zpool binaries were found during configure phase. This is not consistent with our attempts to move dependencies on binaries from compile to runtime. And also it is inconsistent with other backends, e.g. vstorage. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 77ee60977d..488490181f 100644 --- a/meson.build +++ b/meson.build @@ -1947,24 +1947,24 @@ if conf.has('WITH_LIBVIRTD') endif if not get_option('storage_zfs').disabled() - zfs_enable = true foreach name : [ 'zfs', 'zpool' ] set_variable( '@0@_prog'.format(name), find_program(name, required: get_option('storage_zfs'), dirs: libvirt_sbin_path) ) - if not get_variable('@0@_prog'.format(name)).found() - zfs_enable = false - endif endforeach - if zfs_enable - use_storage = true - conf.set('WITH_STORAGE_ZFS', 1) - foreach name : [ 'zfs', 'zpool' ] - conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(name)).path()) - endforeach - endif + use_storage = true + conf.set('WITH_STORAGE_ZFS', 1) + foreach name : [ 'zfs', 'zpool' ] + prog_var = get_variable('@0@_prog'.format(name)) + if prog_var.found() + prog_path = prog_var.path() + else + prog_path = name + endif + conf.set_quoted(name.to_upper(), prog_path) + endforeach endif endif -- 2.32.0
On a Tuesday in 2021, Michal Privoznik wrote:
Pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/370312403
Michal Prívozník (3): lib: Use $PROG instead of $PROG_PATH meson: Don't set $PROG_PATH macros meson: Enable ZFS storage backend more often
meson.build | 24 +++++----- src/util/virfirewall.c | 8 ++-- src/util/virnetdevip.c | 14 +++--- tests/virfirewalltest.c | 98 ++++++++++++++++++++--------------------- 4 files changed, 71 insertions(+), 73 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Michal Privoznik