1. Patchew
  2. Libvirt
  3. View series

[PATCH v3] build: set firewall_backend_priority regardless of driver_network

Marek Marczykowski-Górecki posted 1 patch 1 week, 1 day ago 
meson.build | 54 +++++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 26 deletions(-)
[PATCH v3] build: set firewall_backend_priority regardless of driver_network
Posted by Marek Marczykowski-Górecki 1 week, 1 day ago 
Set firewall_backend_priority whenever WITH_NWFILTER or WITH_NETWORK is
set. And similarly, print firewall backends on the same condition.

Otherwise a build with -Ddriver_network=disabled fails with:

    src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority".

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
 meson.build | 54 +++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/meson.build b/meson.build
index 927665b5fb..c15e4b43bf 100644
--- a/meson.build
+++ b/meson.build
@@ -1650,31 +1650,6 @@ endif
 
 if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD')
   conf.set('WITH_NETWORK', 1)
-
-  firewall_backend_priority = get_option('firewall_backend_priority')
-  if firewall_backend_priority.length() == 0
-      if host_machine.system() == 'linux'
-          firewall_backend_priority = ['nftables', 'iptables']
-      elif host_machine.system() == 'freebsd'
-          firewall_backend_priority = ['pf']
-      else
-          # No firewall impl on non-Linux so far, so force 'none'
-          # as placeholder
-          firewall_backend_priority = ['none']
-      endif
-  else
-      if host_machine.system() != 'linux'
-          error('firewall backend priority only supported on linux hosts')
-      endif
-  endif
-
-  backends = []
-  foreach backend: firewall_backend_priority
-      backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper()
-      backends += backend
-  endforeach
-
-  conf.set('FIREWALL_BACKENDS', ', '.join(backends))
 elif get_option('driver_network').enabled()
   error('libvirtd must be enabled to build the network driver')
 endif
@@ -2035,6 +2010,33 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux'
   conf.set('WITH_NWFILTER', 1)
 endif
 
+if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK')
+  firewall_backend_priority = get_option('firewall_backend_priority')
+  if firewall_backend_priority.length() == 0
+      if host_machine.system() == 'linux'
+          firewall_backend_priority = ['nftables', 'iptables']
+      elif host_machine.system() == 'freebsd'
+          firewall_backend_priority = ['pf']
+      else
+          # No firewall impl on non-Linux so far, so force 'none'
+          # as placeholder
+          firewall_backend_priority = ['none']
+      endif
+  else
+      if host_machine.system() != 'linux'
+          error('firewall backend priority only supported on linux hosts')
+      endif
+  endif
+
+  backends = []
+  foreach backend: firewall_backend_priority
+      backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper()
+      backends += backend
+  endforeach
+
+  conf.set('FIREWALL_BACKENDS', ', '.join(backends))
+endif
+
 if not get_option('pm_utils').disabled()
   use_pm_utils = true
   if init_script == 'systemd'
@@ -2373,7 +2375,7 @@ misc_summary = {
   'virt-login-shell': conf.has('WITH_LOGIN_SHELL'),
   'Warning Flags': supported_cc_flags,
 }
-if conf.has('WITH_NETWORK')
+if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK')
   misc_summary += {
     'firewall backends': firewall_backend_priority,
   }
-- 
2.54.0
Re: [PATCH v3] build: set firewall_backend_priority regardless of driver_network
Posted by Daniel P. Berrangé via Devel 1 week, 1 day ago 
On Fri, Oct 16, 2026 at 02:40:44PM +0200, Marek Marczykowski-Górecki wrote:
> Set firewall_backend_priority whenever WITH_NWFILTER or WITH_NETWORK is
> set. And similarly, print firewall backends on the same condition.
> 
> Otherwise a build with -Ddriver_network=disabled fails with:
> 
>     src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority".
> 
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> ---
>  meson.build | 54 +++++++++++++++++++++++++++--------------------------
>  1 file changed, 28 insertions(+), 26 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Since Michal already pushd the v1 patch, I'll revert that and
then push this v3 independently.


> 
> diff --git a/meson.build b/meson.build
> index 927665b5fb..c15e4b43bf 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1650,31 +1650,6 @@ endif
>  
>  if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD')
>    conf.set('WITH_NETWORK', 1)
> -
> -  firewall_backend_priority = get_option('firewall_backend_priority')
> -  if firewall_backend_priority.length() == 0
> -      if host_machine.system() == 'linux'
> -          firewall_backend_priority = ['nftables', 'iptables']
> -      elif host_machine.system() == 'freebsd'
> -          firewall_backend_priority = ['pf']
> -      else
> -          # No firewall impl on non-Linux so far, so force 'none'
> -          # as placeholder
> -          firewall_backend_priority = ['none']
> -      endif
> -  else
> -      if host_machine.system() != 'linux'
> -          error('firewall backend priority only supported on linux hosts')
> -      endif
> -  endif
> -
> -  backends = []
> -  foreach backend: firewall_backend_priority
> -      backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper()
> -      backends += backend
> -  endforeach
> -
> -  conf.set('FIREWALL_BACKENDS', ', '.join(backends))
>  elif get_option('driver_network').enabled()
>    error('libvirtd must be enabled to build the network driver')
>  endif
> @@ -2035,6 +2010,33 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux'
>    conf.set('WITH_NWFILTER', 1)
>  endif
>  
> +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK')
> +  firewall_backend_priority = get_option('firewall_backend_priority')
> +  if firewall_backend_priority.length() == 0
> +      if host_machine.system() == 'linux'
> +          firewall_backend_priority = ['nftables', 'iptables']
> +      elif host_machine.system() == 'freebsd'
> +          firewall_backend_priority = ['pf']
> +      else
> +          # No firewall impl on non-Linux so far, so force 'none'
> +          # as placeholder
> +          firewall_backend_priority = ['none']
> +      endif
> +  else
> +      if host_machine.system() != 'linux'
> +          error('firewall backend priority only supported on linux hosts')
> +      endif
> +  endif
> +
> +  backends = []
> +  foreach backend: firewall_backend_priority
> +      backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper()
> +      backends += backend
> +  endforeach
> +
> +  conf.set('FIREWALL_BACKENDS', ', '.join(backends))
> +endif
> +
>  if not get_option('pm_utils').disabled()
>    use_pm_utils = true
>    if init_script == 'systemd'
> @@ -2373,7 +2375,7 @@ misc_summary = {
>    'virt-login-shell': conf.has('WITH_LOGIN_SHELL'),
>    'Warning Flags': supported_cc_flags,
>  }
> -if conf.has('WITH_NETWORK')
> +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK')
>    misc_summary += {
>      'firewall backends': firewall_backend_priority,
>    }
> -- 
> 2.54.0
> 

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.