[PATCH] util: remove compile time tests for IFF_VNET_HDR/IFF_MULTI_QUEUE

[Michal Prívozník]

On 9/24/20 2:20 PM, Daniel P. Berrangé wrote:
> The former has been present since
> 
>    commit f43798c27684ab925adde7d8acc34c78c6e50df8
>    Author: Rusty Russell <rusty at rustcorp.com.au>
>    Date:   Thu Jul 3 03:48:02 2008 -0700
> 
>      tun: Allow GSO using virtio_net_hdr
> 
> and the latter since
> 
>    commit bbb009941efaece3898910a862f6d23aa55d6ba8
>    Author: Jason Wang <jasowang at redhat.com>
>    Date:   Wed Oct 31 19:45:59 2012 +0000
> 
>      tuntap: introduce multiqueue flags
> 
> these are old enough that they can be assumed present in all Linux
> platforms we support. The tap device creation code changed is specific
> to Linux, with a separate impl for non-Linux platforms.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>   src/util/virnetdevtap.c | 11 +----------
>   1 file changed, 1 insertion(+), 10 deletions(-)
> 

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 143e1ab98c..c2bcd6d224 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -380,18 +380,10 @@ virNetDevMacVLanTapSetup(int *tapfd, size_t 
tapfdSize, bool vnet_hdr)
              new_flags &= ~IFF_VNET_HDR;
          }

-# ifdef IFF_MULTI_QUEUE
          if (tapfdSize > 1)
              new_flags |= IFF_MULTI_QUEUE;
          else
              new_flags &= ~IFF_MULTI_QUEUE;
-# else
-        if (tapfdSize > 1) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("Multiqueue devices are not supported on 
this system"));
-            return -1;
-        }
-# endif


I think this should be squashed in.

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal