From nobody Sat Apr 27 19:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600950051; cv=none; d=zohomail.com; s=zohoarc; b=hpei5e6d/gSgNLLEJg23pY4ejIY/QqUU5eSZcKRuq4N2BNk3QpYXa9WwZVGsqA41xT5/AQeUui+dF+zwwqZuOgPodU95XHgL57ACAlWaVUe7+hbzDtpdgibHSpoMOi7lPcV6ItD5sl+uX1GBKB9hc6VJNFvVkrOXF+qApETIZA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600950051; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=S17Q3LwRbByt6zKYcJd8I66BkkG/p47IAg62kxFmzBk=; b=Fige3Xfzvt48kPb9ajO/A2wLEdwda8envlLkboYyRYrRisY7qnFvK4eSc0/ty1sOY3xmkuz7KKLHde+dzchqqpJaZzRrzodvFjbuXvaUdewN4C6O8xTtK9RfafJKeg6nbQinx79eapj4NJlWQBqGDdCqY3dqyOzcmIpXyTsu/cM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600950051259957.2454718324577; Thu, 24 Sep 2020 05:20:51 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-0gpnR6SMMn6vX4HKoIdyHQ-1; Thu, 24 Sep 2020 08:20:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADA94188C12B; Thu, 24 Sep 2020 12:20:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BE42C1002C0B; Thu, 24 Sep 2020 12:20:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2CAFC181A050; Thu, 24 Sep 2020 12:20:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08OCKXQe015427 for ; Thu, 24 Sep 2020 08:20:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5FB05D98C; Thu, 24 Sep 2020 12:20:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-25.ams2.redhat.com [10.36.115.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC6575D9F7; Thu, 24 Sep 2020 12:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600950049; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=S17Q3LwRbByt6zKYcJd8I66BkkG/p47IAg62kxFmzBk=; b=TYGylwGmQcC+8oqWHgAZyyxI0UuCmht4LC3E/yrAU0OqJ5xavftDQrgmjmmsoeW0101jgh w9/BvgJII5nb/S8o1ijvaKv3UG52QRmjeenegTp4ThnOJNQ+g5GIeYdW8uOk4cfDV/0k4Z dWUpAdNCn4HoY3ZtrZ8OHh9mpTjY+y4= X-MC-Unique: 0gpnR6SMMn6vX4HKoIdyHQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] util: remove compile time tests for IFF_VNET_HDR/IFF_MULTI_QUEUE Date: Thu, 24 Sep 2020 13:20:27 +0100 Message-Id: <20200924122027.2140044-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The former has been present since commit f43798c27684ab925adde7d8acc34c78c6e50df8 Author: Rusty Russell 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 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=C3=A9 Reviewed-by: Michal Privoznik --- src/util/virnetdevtap.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 77c4d1c52c..1738f48a5f 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -292,20 +292,11 @@ int virNetDevTapCreate(char **ifname, =20 ifr.ifr_flags =3D IFF_TAP | IFF_NO_PI; /* If tapfdSize is greater than one, request multiqueue */ - if (tapfdSize > 1) { -# ifdef IFF_MULTI_QUEUE + if (tapfdSize > 1) ifr.ifr_flags |=3D IFF_MULTI_QUEUE; -# else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiqueue devices are not supported on this= system")); - goto cleanup; -# endif - } =20 -# ifdef IFF_VNET_HDR if (flags & VIR_NETDEV_TAP_CREATE_VNET_HDR) ifr.ifr_flags |=3D IFF_VNET_HDR; -# endif =20 if (virStrcpyStatic(ifr.ifr_name, *ifname) < 0) { virReportSystemError(ERANGE, --=20 2.26.2