patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v3] eal/windows: fix link error with MinGW
       [not found] <20201120211255.24803-1-nick.connolly@mayadata.io>
@ 2020-11-22  8:45 ` Nick Connolly
  2020-11-22  9:00   ` Tal Shnaiderman
  0 siblings, 1 reply; 3+ messages in thread
From: Nick Connolly @ 2020-11-22  8:45 UTC (permalink / raw)
  To: Dmitry Kozlyuk, Narcisa Ana Maria Vasile, Dmitry Malloy,
	Pallavi Kadam, Tal Shnaiderman
  Cc: dev, Nick Connolly, stable

Linking with the 'pci' driver when building with MinGW on
Windows fails with undefined symbol 'GUID_DEVCLASS_NET'.
This occurs because devguid.h is included in rte_windows.h
before INITGUID is defined.

Move the include of devguid.h after the definition of INITGUID.

Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
Cc: stable@dpdk.org

Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
---
v2
* Change Cc to stable@dpdk.org
v2
* Fix commit message - add blank line, use present tense

 lib/librte_eal/windows/include/rte_windows.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h
index 0a5e71a05..b82af34f6 100644
--- a/lib/librte_eal/windows/include/rte_windows.h
+++ b/lib/librte_eal/windows/include/rte_windows.h
@@ -25,13 +25,13 @@
 #include <psapi.h>
 #include <setupapi.h>
 #include <winioctl.h>
-#include <devguid.h>
 
 /* Have GUIDs defined. */
 #ifndef INITGUID
 #define INITGUID
 #endif
 #include <initguid.h>
+#include <devguid.h>
 #include <rte_log.h>
 
 /**
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v3] eal/windows: fix link error with MinGW
  2020-11-22  8:45 ` [dpdk-stable] [PATCH v3] eal/windows: fix link error with MinGW Nick Connolly
@ 2020-11-22  9:00   ` Tal Shnaiderman
  2020-11-22 17:57     ` Thomas Monjalon
  0 siblings, 1 reply; 3+ messages in thread
From: Tal Shnaiderman @ 2020-11-22  9:00 UTC (permalink / raw)
  To: Nick Connolly, Dmitry Kozlyuk, Narcisa Ana Maria Vasile,
	Dmitry Malloy, Pallavi Kadam, Tal Shnaiderman
  Cc: dev, stable

> Subject: [PATCH v3] eal/windows: fix link error with MinGW
> 
> Linking with the 'pci' driver when building with MinGW on Windows fails with
> undefined symbol 'GUID_DEVCLASS_NET'.
> This occurs because devguid.h is included in rte_windows.h before INITGUID
> is defined.
> 
> Move the include of devguid.h after the definition of INITGUID.
> 
> Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
> ---
> v2
> * Change Cc to stable@dpdk.org
> v2
> * Fix commit message - add blank line, use present tense
> 
>  lib/librte_eal/windows/include/rte_windows.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/librte_eal/windows/include/rte_windows.h
> b/lib/librte_eal/windows/include/rte_windows.h
> index 0a5e71a05..b82af34f6 100644
> --- a/lib/librte_eal/windows/include/rte_windows.h
> +++ b/lib/librte_eal/windows/include/rte_windows.h
> @@ -25,13 +25,13 @@
>  #include <psapi.h>
>  #include <setupapi.h>
>  #include <winioctl.h>
> -#include <devguid.h>
> 
>  /* Have GUIDs defined. */
>  #ifndef INITGUID
>  #define INITGUID
>  #endif
>  #include <initguid.h>
> +#include <devguid.h>
>  #include <rte_log.h>
> 
>  /**
> --
> 2.25.1

Reviewed-by: Tal Shnaiderman <talshn@nvidia.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v3] eal/windows: fix link error with MinGW
  2020-11-22  9:00   ` Tal Shnaiderman
@ 2020-11-22 17:57     ` Thomas Monjalon
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2020-11-22 17:57 UTC (permalink / raw)
  To: Nick Connolly
  Cc: Dmitry Kozlyuk, Narcisa Ana Maria Vasile, Dmitry Malloy,
	Pallavi Kadam, stable, dev, Tal Shnaiderman

> > Linking with the 'pci' driver when building with MinGW on Windows fails with
> > undefined symbol 'GUID_DEVCLASS_NET'.
> > This occurs because devguid.h is included in rte_windows.h before INITGUID
> > is defined.
> > 
> > Move the include of devguid.h after the definition of INITGUID.
> > 
> > Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
> 
> Reviewed-by: Tal Shnaiderman <talshn@nvidia.com>

Applied, thanks





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-22 17:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20201120211255.24803-1-nick.connolly@mayadata.io>
2020-11-22  8:45 ` [dpdk-stable] [PATCH v3] eal/windows: fix link error with MinGW Nick Connolly
2020-11-22  9:00   ` Tal Shnaiderman
2020-11-22 17:57     ` Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).