From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 296BAA0524 for ; Fri, 5 Feb 2021 12:31:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22AA5188946; Fri, 5 Feb 2021 12:31:22 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id AED6840682 for ; Fri, 5 Feb 2021 12:31:20 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id t142so3575447wmt.1 for ; Fri, 05 Feb 2021 03:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+jm1WOSdypi8fW6tGhZB+1SP0v/MxpxhplR5VqMe1wM=; b=SSCX5ISArZ6J/NKFOanVsvVSwIDoGt+DH7/36OQjHapvbNOPurtYKB5ul2PpKhnPzH l1oMEFVcxy1KCRYWSNGy1OB5OlQh6IxA7eomboVLGHThv8CqhJcImJ2G1T6tKVMsmP5p OfYH9HJDl8nNINOdVH17DpZr6GCxYripXJdDyeo01FJ/rSsvJ5ww3Q1lgG6f7G46i1Rg iv71zi8PAF+F8d9bdJ2kbFvoE25f5S2aS2cN4UrRoAG8DqaplbpqSjElpVdqe7tt7vTW wkAz5Ir7NNzp4tri88e1xqeDyULrEO4SnX67Zj/l8dvycc2WLb8SfHLSULNyISkx0cMP dRrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+jm1WOSdypi8fW6tGhZB+1SP0v/MxpxhplR5VqMe1wM=; b=fHlMTwqUQXEMDMTvi0BT+XzcqX5uhR3xD95TCX0f8vf+YHEUvIBUVYLmrwDidUVSfU 3U9xMOm5dWBNEafx3hLwYZ4t++PW4a4iigsSXIbIn1vm0hRbk8HmMWOan6Xal6rNCKtz qOcYKX9MrbJFYJBr6vP9UOEYzhCvSxb5lI+Vu1uKgDEqBpKWqONEbOGinJnkK+swhhL1 4bkIfCRKN3RXttC9yE4blaVjVCdV74rDZztJw0UY8h+K82YHku7Jt5Go0oK2n44j/acs SwEcqLWkah3T9996zEDbnpUwoDLRawlsoMbX5MinqyNk1Lsie4njwfophfint56C94vK SM7A== X-Gm-Message-State: AOAM530Blnge01lW+2K4sC1zCh0HqPta19bbeBRpzFRzKBrHzfg7O/bD LpX3O1JXjQ3tgYF5vsMWEa8= X-Google-Smtp-Source: ABdhPJxMx2D6FCg4b8Azl0UWiLZD6nd2/nlHi4O1KIlSe/+SSqeFQ5PMGC7iOfyL1M54Jje0gCLpmA== X-Received: by 2002:a1c:f70f:: with SMTP id v15mr3166159wmh.38.1612524680435; Fri, 05 Feb 2021 03:31:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g14sm12552771wru.45.2021.02.05.03.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:19 -0800 (PST) From: luca.boccassi@gmail.com To: Tyler Retzlaff Cc: Dmitry Kozlyuk , Ranjit Menon , dpdk stable Date: Fri, 5 Feb 2021 11:16:43 +0000 Message-Id: <20210205111920.1272063-117-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix build with Windows SDK >= 10.0.20253' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/508b619978817e3629f81010a596a8f546c641a6 Thanks. Luca Boccassi --- >From 508b619978817e3629f81010a596a8f546c641a6 Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff Date: Thu, 14 Jan 2021 13:22:35 -0800 Subject: [PATCH] bus/pci: fix build with Windows SDK >= 10.0.20253 [ upstream commit 6605c7f02e2410e932019ee554c21287c727d34f ] NetUIO device class and interface GUIDs are defined in system headers starting from platform SDK v10.0.20253. Inspect SDK version to avoid redefinition. Pre-release SDKs do not promise compatibility and a narrow subset of SDKs may still be subject to redefinition. Fixes: c76ec01b4591 (bus/pci: support netuio on Windows) Signed-off-by: Tyler Retzlaff Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon --- drivers/bus/pci/windows/pci_netuio.c | 6 ++++++ drivers/bus/pci/windows/pci_netuio.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c index 6701948392..1bf9133f71 100644 --- a/drivers/bus/pci/windows/pci_netuio.c +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -7,6 +7,12 @@ #include #include +#ifdef __MINGW32__ +#include +#else +#include +#endif + #include "private.h" #include "pci_netuio.h" diff --git a/drivers/bus/pci/windows/pci_netuio.h b/drivers/bus/pci/windows/pci_netuio.h index 9a77806b57..2f6c97ea73 100644 --- a/drivers/bus/pci/windows/pci_netuio.h +++ b/drivers/bus/pci/windows/pci_netuio.h @@ -5,6 +5,7 @@ #ifndef _PCI_NETUIO_H_ #define _PCI_NETUIO_H_ +#if !defined(NTDDI_WIN10_FE) || NTDDI_VERSION < NTDDI_WIN10_FE /* GUID definition for device class netUIO */ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, 0xa3, 0x29, 0xf3, 0x22, 0xeb, 0xad, 0xbe, 0x0f); @@ -12,6 +13,7 @@ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, /* GUID definition for the netuio device interface */ DEFINE_GUID(GUID_DEVINTERFACE_NETUIO, 0x08336f60, 0x0679, 0x4c6c, 0x85, 0xd2, 0xae, 0x7c, 0xed, 0x65, 0xff, 0xf7); +#endif /* IOCTL code definitions */ #define IOCTL_NETUIO_MAP_HW_INTO_USERSPACE \ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.467105396 +0000 +++ 0117-bus-pci-fix-build-with-Windows-SDK-10.0.20253.patch 2021-02-05 11:18:28.990694615 +0000 @@ -1 +1 @@ -From 6605c7f02e2410e932019ee554c21287c727d34f Mon Sep 17 00:00:00 2001 +From 508b619978817e3629f81010a596a8f546c641a6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6605c7f02e2410e932019ee554c21287c727d34f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org