Re: [PATCH v2 12/15] qemu-common: move glib-compat.h

[Warner Losh]

On Tue, Jul 12, 2022 at 3:37 AM  wrote:

> From: Marc-André Lureau 
>
> qemu-common will have compatible dependency requirements with QEMU.
>
> Since qemu-common won't have a toplevel qemu/osdep.h which would include
> various system headers, include stdbool.h (bool is used for some
> declarations here).
>
> Replace getenv() with g_getenv() to avoid extra header inclusion.
>
> Signed-off-by: Marc-André Lureau 
> ---
>  {include => subprojects/qemu-common/include}/glib-compat.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>  rename {include => subprojects/qemu-common/include}/glib-compat.h (97%)
>

Reviewed-by: Warner Losh 


>
> diff --git a/include/glib-compat.h
> b/subprojects/qemu-common/include/glib-compat.h
> similarity index 97%
> rename from include/glib-compat.h
> rename to subprojects/qemu-common/include/glib-compat.h
> index 43a562974d80..2b0f2962f322 100644
> --- a/include/glib-compat.h
> +++ b/subprojects/qemu-common/include/glib-compat.h
> @@ -30,6 +30,8 @@
>  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
>
>  #include 
> +#include 
> +
>  #if defined(G_OS_UNIX)
>  #include 
>  #include 
> @@ -133,7 +135,7 @@ qemu_g_test_slow(void)
>  {
>  static int cached = -1;
>  if (cached == -1) {
> -cached = g_test_slow() || getenv("G_TEST_SLOW") != NULL;
> +cached = g_test_slow() || g_getenv("G_TEST_SLOW") != NULL;
>  }
>  return cached;
>  }
> --
> 2.37.0.rc0
>
>

[PATCH v2 12/15] qemu-common: move glib-compat.h

[marcandre . lureau]

From: Marc-André Lureau 

qemu-common will have compatible dependency requirements with QEMU.

Since qemu-common won't have a toplevel qemu/osdep.h which would include
various system headers, include stdbool.h (bool is used for some
declarations here).

Replace getenv() with g_getenv() to avoid extra header inclusion.

Signed-off-by: Marc-André Lureau 
---
 {include => subprojects/qemu-common/include}/glib-compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename {include => subprojects/qemu-common/include}/glib-compat.h (97%)

diff --git a/include/glib-compat.h 
b/subprojects/qemu-common/include/glib-compat.h
similarity index 97%
rename from include/glib-compat.h
rename to subprojects/qemu-common/include/glib-compat.h
index 43a562974d80..2b0f2962f322 100644
--- a/include/glib-compat.h
+++ b/subprojects/qemu-common/include/glib-compat.h
@@ -30,6 +30,8 @@
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include 
+#include 
+
 #if defined(G_OS_UNIX)
 #include 
 #include 
@@ -133,7 +135,7 @@ qemu_g_test_slow(void)
 {
 static int cached = -1;
 if (cached == -1) {
-cached = g_test_slow() || getenv("G_TEST_SLOW") != NULL;
+cached = g_test_slow() || g_getenv("G_TEST_SLOW") != NULL;
 }
 return cached;
 }
-- 
2.37.0.rc0