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 E7953A04B5; Tue, 12 Jan 2021 23:33:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C88E7140D3A; Tue, 12 Jan 2021 23:33:47 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 729E0140D23 for ; Tue, 12 Jan 2021 23:33:46 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id B573920B6C40; Tue, 12 Jan 2021 14:33:45 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B573920B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1610490825; bh=CkUFpoDyVdPCeOVJ1ugCnua0FUdU6LCqftBfNZ0rnGs=; h=From:To:Cc:Subject:Date:From; b=Uc218onRVLUH20YwlzZEpzPsJO9eV0wxz3iozM48bkVw8SKU1mwpTaE2CltFN7i0n u1eqGAwpHHpdOzZlfIJj9+evWzbyfUn6E4SncX5QXbGXFoqDKiOSxdJz9D28NCIvkT pmnUf0DW/252MrAe1bEnwZFECouuCjcYUEEV/F4c= From: Tyler Retzlaff To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com Date: Tue, 12 Jan 2021 14:33:41 -0800 Message-Id: <1610490821-2938-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] bus/pci/windows: guard against sdk/dpdk guid collision X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" DEVCLASS and DEVINTERFACE guids are defined/managed by the windows platform sdk headers. * hide dpdk defined GUID_DEVCLASS_NETUIO and GUID_DEVINTERFACE_NETUIO if the NTDDI_VERSION >= 0x0A00000A * include for windows sdk defined GUID_DEVINTERFACE_NETUIO Signed-off-by: Tyler Retzlaff --- drivers/bus/pci/windows/pci_netuio.c | 2 ++ drivers/bus/pci/windows/pci_netuio.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c index 670194839..e2bf45724 100644 --- a/drivers/bus/pci/windows/pci_netuio.c +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -7,6 +7,8 @@ #include #include +#include + #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 9a77806b5..2bf5a201a 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.0.vfs.0.0