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 14B7748A44 for ; Fri, 31 Oct 2025 15:37:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0DC2D40678; Fri, 31 Oct 2025 15:37:52 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id EFABB40678 for ; Fri, 31 Oct 2025 15:37:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hlmGlqJ6Gx7WnkCIjFBdCFodBqvC25kJOjiYqtASnz4=; b=KjlcvwqZ5kHj0nbpCKjNh2iG/T642gAfHvkVeh54cHv82ppq2K45yJP/TlWsul7u3hoHeZ ftNaPZBxnwGkidib+Igp8qzXbu8KoFwdZygB/HxQkPr5fZccuJdutJJeFn31ByG4LUKpi3 0rFkMGszkx2ank32jGJH2LB3tIdArbo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-44-aVW8c52zO_CEC5Co1KKd6A-1; Fri, 31 Oct 2025 10:37:49 -0400 X-MC-Unique: aVW8c52zO_CEC5Co1KKd6A-1 X-Mimecast-MFC-AGG-ID: aVW8c52zO_CEC5Co1KKd6A_1761921468 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E682A180A970; Fri, 31 Oct 2025 14:37:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5641518004D4; Fri, 31 Oct 2025 14:37:45 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Bruce Richardson , dpdk stable Subject: patch 'bus/pci: fix build with MinGW 13' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:33:06 +0000 Message-ID: <20251031143421.324432-64-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1qG112KLtX0hMnwCSEv-pI2uRYK38gJ5SRG0Qn0GJPo_1761921468 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b9fa5274f62a0117dc6c2bd0c0c3a6a07c3d70f9 Thanks. Kevin --- >From b9fa5274f62a0117dc6c2bd0c0c3a6a07c3d70f9 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 25 Jul 2025 20:23:59 +0200 Subject: [PATCH] bus/pci: fix build with MinGW 13 [ upstream commit 73e0c90c48ea393b2725263b32515f668f8f4839 ] After an upgrade to MinGW version 13, some compilation errors appear: drivers/bus/pci/windows/pci.c:362:58: error: 'GUID_DEVCLASS_NETUIO' undeclared drivers/bus/pci/windows/pci_netuio.c:57:39: error: 'GUID_DEVINTERFACE_NETUIO' undeclared The cause is MinGW has set NTDDI_VERSION to the highest version without defining the expected NetUIO constants. The case MinGW64 is added to define NetUIO constants. Some comments are improved to better track includes requirements. Fixes: 6605c7f02e24 ("bus/pci: fix build with Windows SDK >= 10.0.20253") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- drivers/bus/pci/windows/pci.c | 11 ++++++----- drivers/bus/pci/windows/pci_netuio.h | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index 36e6f89093..ca89a7fa50 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -12,10 +12,6 @@ #include -#include "private.h" -#include "pci_netuio.h" - +/* DEVPKEY_Device_Numa_Node should be defined in devpkey.h */ #include -#include - #if defined RTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR < 8) #include @@ -24,4 +20,9 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc, #endif +#include + +#include "private.h" +#include "pci_netuio.h" + /* * This code is used to simulate a PCI probe by parsing information in diff --git a/drivers/bus/pci/windows/pci_netuio.h b/drivers/bus/pci/windows/pci_netuio.h index 2f6c97ea73..8ac914920f 100644 --- a/drivers/bus/pci/windows/pci_netuio.h +++ b/drivers/bus/pci/windows/pci_netuio.h @@ -6,10 +6,10 @@ #define _PCI_NETUIO_H_ -#if !defined(NTDDI_WIN10_FE) || NTDDI_VERSION < NTDDI_WIN10_FE -/* GUID definition for device class netUIO */ +#if !defined(NTDDI_WIN10_FE) || NTDDI_VERSION < NTDDI_WIN10_FE || defined(__MINGW64__) +/* GUID_DEVCLASS_NETUIO should be defined in devguid.h */ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, 0xa3, 0x29, 0xf3, 0x22, 0xeb, 0xad, 0xbe, 0x0f); -/* GUID definition for the netuio device interface */ +/* GUID_DEVINTERFACE_NETUIO should be defined in ndisguid.h */ DEFINE_GUID(GUID_DEVINTERFACE_NETUIO, 0x08336f60, 0x0679, 0x4c6c, 0x85, 0xd2, 0xae, 0x7c, 0xed, 0x65, 0xff, 0xf7); -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:54.219605461 +0000 +++ 0064-bus-pci-fix-build-with-MinGW-13.patch 2025-10-31 13:53:52.170387279 +0000 @@ -1 +1 @@ -From 73e0c90c48ea393b2725263b32515f668f8f4839 Mon Sep 17 00:00:00 2001 +From b9fa5274f62a0117dc6c2bd0c0c3a6a07c3d70f9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 73e0c90c48ea393b2725263b32515f668f8f4839 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index e7e449306e..6f6f368cb7 100644 +index 36e6f89093..ca89a7fa50 100644 @@ -34 +35 @@ -@@ -13,10 +13,6 @@ +@@ -12,10 +12,6 @@ @@ -46 +47 @@ -@@ -25,4 +21,9 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc, +@@ -24,4 +20,9 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc,