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 D0220489EF for ; Mon, 27 Oct 2025 17:22:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA8834028B; Mon, 27 Oct 2025 17:22:09 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 76F3C4028B for ; Mon, 27 Oct 2025 17:22:09 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-471191ac79dso50896105e9.3 for ; Mon, 27 Oct 2025 09:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582129; x=1762186929; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nt9ZOUP5MmFYy0hSWiFP8z0MqjgwThPOImeJVQHRYuQ=; b=jpmtVSx+ZTkTgq8D/rOb990BxGo+9m1PSdgERpXl+NjvYn23X6HGj+kXAemq33aTpC iYqKHA7EWQJl4b3tmMVAOprUCEQNOIzEwX+zaW4J9Bcg6l7HibAZLLgfmC3EtGXMd2d5 eGBaFbAZZpmSrqovqyFAGsB0PqT+t+c1pRFVQyLbKAyxrunSgI/bncc8jWMDOrRGOP0B V11s03bOxXYvM0knZ+mx8bZWaLMZ4238bgyPcmVTCkV8vAK06gPoMi/IIPwqGr83TlWb hy7yTePDoG8ZVkzf7unVdeOKgmW+fiPkQkDCetGOJjqwiKQxdVTy75mZcVgSeY2OvmJ6 VzCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582129; x=1762186929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nt9ZOUP5MmFYy0hSWiFP8z0MqjgwThPOImeJVQHRYuQ=; b=E+M2ZdzoHFo6La9kpeSVPMoq4Jig4ArFcBhr2uCaoNp4ovu26GQkdLAVFA/bRpPnwB Hnfrg0pnvKGXlOJFuCKg/QtSOf9q6ZzZI+mWcxkcVkCfIL9nq4+ZsSa2XXtjV9WhEfGn 5YpeI8BBeheQiOxpcK7peOpuxAY/CMSptLTkLbDY9uigIM1XkTVICWi6MFqjcb+hutl/ WydFh4mhYCYqUwRV2JQTD84fZ2z/j4t3H5bdH+OL4x5ViTqE/h7kUxB5snmabZykeH/K XzCOHmglyhZ88M9cwAZv5hhR3Y1Ybi6GcQktGby1Jus/KiR9BBtdXcFrK3BP3GGQyB1y SxDw== X-Forwarded-Encrypted: i=1; AJvYcCUvvcxOxkATklMQNi9+RXkw4uZPv7yhR9EOF2WLloLBgJQSYpytR/3SA7oyCrTFCQ7wGeO2UL8=@dpdk.org X-Gm-Message-State: AOJu0YwpXV0gUWlgF3e6i550SR+r/oVdepN8XvRZ6z58JkyaX/J5euSI h36CAK+Sbb9ELUW4FMR/xf8tNmTW4JswSKAOCQr/8DRqwVoG+dQGMEyYc8QziQ== X-Gm-Gg: ASbGnctzOHGM2fNN4oZtfNADNfsNouFqWxNEdtOAL/NWxL06pKVl8hM5gWE+YPs9tJB taHotlUhRiuoXk5VOh/Kfv/G4jYH7AK5uG4RJGuoYstkznRZgxjkNPGEcxBPMo5zalRTXJqES74 /QTVyLOOlYLW4wsbEgVh5Fzjut1hR7iackz2ZuHDj+3CKUMliYbX//CJA6018nr+sk7jEYW7d7a MiDCYVIYA7k/kJl7Ca6uz9UCVuLznWu5xeHALTOXGZ2lJLph6ptsVWX/jQqoxeW5Co703T7XqHi LBd7WE1mI5spX89534bUypkoFKYqirYrNkpjMNgDFxZ/oBr8Vn3yn7YapCV6THjJgS+EZXyu8IK uFA6ZJoZxZBhHkdjlpHbsWMBW6Lb8VcLGZJQ02r51DdAZTAIr+pOHQ8NY4pAQYqb0kTmqpev1Mx xCehCWJg== X-Google-Smtp-Source: AGHT+IHQRCmZEWzi6aOvy1ZHRWwZjF2A2IibIf2QDaiAOdFFoSeIP7/P6hFsB6gqFGAoVa+W5Uf/bw== X-Received: by 2002:a05:600c:3e08:b0:46e:2e93:589f with SMTP id 5b1f17b1804b1-47717e03712mr2126945e9.14.1761582128966; Mon, 27 Oct 2025 09:22:08 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-475dcb9d92esm73733625e9.0.2025.10.27.09.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:22:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Bruce Richardson , dpdk stable Subject: patch 'bus/pci: fix build with MinGW 13' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:19:17 +0000 Message-ID: <20251027162001.3710450-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/29/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8d68edf4b27bf7314f464d420763c8ca9a548191 Thanks. Luca Boccassi --- >From 8d68edf4b27bf7314f464d420763c8ca9a548191 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 5cf05ce1a0..9b065092e6 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -11,18 +11,19 @@ #include #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 DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 3); #endif +#include + +#include "private.h" +#include "pci_netuio.h" + /* * This code is used to simulate a PCI probe by parsing information in * the registry hive for PCI devices. 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 @@ -5,12 +5,12 @@ #ifndef _PCI_NETUIO_H_ #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); #endif -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:36.278965859 +0000 +++ 0039-bus-pci-fix-build-with-MinGW-13.patch 2025-10-27 15:54:34.811949950 +0000 @@ -1 +1 @@ -From 73e0c90c48ea393b2725263b32515f668f8f4839 Mon Sep 17 00:00:00 2001 +From 8d68edf4b27bf7314f464d420763c8ca9a548191 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 5cf05ce1a0..9b065092e6 100644 @@ -34 +35 @@ -@@ -12,18 +12,19 @@ +@@ -11,18 +11,19 @@