[Qemu-devel] [PATCH v2] libcacard: Fix compilation for older versions of glib (bug #1258168)

[Qemu-devel] [PATCH v2] libcacard: Fix compilation for older versions of glib (bug #1258168)

[Stefan Weil]

See https://bugs.launchpad.net/bugs/1258168

libcacard/vscclient.c: In function 'do_socket_read':
libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached'
libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached'
libcacard/vscclient.c: In function 'main':
libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref'
libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref'
...
libcacard/vscclient.o: In function `do_socket_read':
libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached'
libcacard/vscclient.o: In function `main':
libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref'

g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is
supported since glib 2.22. QEMU requires glib 2.12, so both names must
not be used.

Instead of showing a warning for code which should not be reached, QEMU
better stops running, so g_warn_if_reached is not useful for QEMU.

In libcacard/vsclient.c, g_byte_array_unref can be replaced by
g_byte_array_free. This is not generally true, so adding a compatibility
layer in include/glib-compat.h is no option here.

Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Reported-by: Don Slutz <dslutz@verizon.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

v2: Fix commit message and add missing parameter for g_byte_array_free.

 libcacard/vscclient.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index a3cb776..f1d46d3 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -407,7 +407,7 @@ do_socket_read(GIOChannel *source,
             }
             break;
         default:
-            g_warn_if_reached();
+            g_assert_not_reached();
             return FALSE;
         }
 
@@ -760,7 +760,7 @@ main(
 
     g_io_channel_unref(channel_stdin);
     g_io_channel_unref(channel_socket);
-    g_byte_array_unref(socket_to_send);
+    g_byte_array_free(socket_to_send, TRUE);
 
     closesocket(sock);
     return 0;
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH v2] libcacard: Fix compilation for older versions of glib (bug #1258168)

[Don Slutz]

On 12/05/13 13:41, Stefan Weil wrote:
> See https://bugs.launchpad.net/bugs/1258168

This fixes the compile issue I have seen so

Tested-by: Don Slutz <dslutz@verizon.com>

    -Don Slutz
> libcacard/vscclient.c: In function 'do_socket_read':
> libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached'
> libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached'
> libcacard/vscclient.c: In function 'main':
> libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref'
> libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref'
> ...
> libcacard/vscclient.o: In function `do_socket_read':
> libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached'
> libcacard/vscclient.o: In function `main':
> libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref'
>
> g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is
> supported since glib 2.22. QEMU requires glib 2.12, so both names must
> not be used.
>
> Instead of showing a warning for code which should not be reached, QEMU
> better stops running, so g_warn_if_reached is not useful for QEMU.
>
> In libcacard/vsclient.c, g_byte_array_unref can be replaced by
> g_byte_array_free. This is not generally true, so adding a compatibility
> layer in include/glib-compat.h is no option here.
>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
> Reported-by: Don Slutz <dslutz@verizon.com>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> v2: Fix commit message and add missing parameter for g_byte_array_free.
>
>   libcacard/vscclient.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
> index a3cb776..f1d46d3 100644
> --- a/libcacard/vscclient.c
> +++ b/libcacard/vscclient.c
> @@ -407,7 +407,7 @@ do_socket_read(GIOChannel *source,
>               }
>               break;
>           default:
> -            g_warn_if_reached();
> +            g_assert_not_reached();
>               return FALSE;
>           }
>   
> @@ -760,7 +760,7 @@ main(
>   
>       g_io_channel_unref(channel_stdin);
>       g_io_channel_unref(channel_socket);
> -    g_byte_array_unref(socket_to_send);
> +    g_byte_array_free(socket_to_send, TRUE);
>   
>       closesocket(sock);
>       return 0;

Re: [Qemu-devel] [PATCH v2] libcacard: Fix compilation for older versions of glib (bug #1258168)

[Alon Levy]

On 12/05/2013 08:41 PM, Stefan Weil wrote:
> See https://bugs.launchpad.net/bugs/1258168
> 
> libcacard/vscclient.c: In function 'do_socket_read':
> libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached'
> libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached'
> libcacard/vscclient.c: In function 'main':
> libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref'
> libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref'
> ...
> libcacard/vscclient.o: In function `do_socket_read':
> libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached'
> libcacard/vscclient.o: In function `main':
> libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref'
> 
> g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is
> supported since glib 2.22. QEMU requires glib 2.12, so both names must
> not be used.
> 
> Instead of showing a warning for code which should not be reached, QEMU
> better stops running, so g_warn_if_reached is not useful for QEMU.

Just note that this fix is in vscclient, so this code is not part of
qemu executable. If you are using QEMU (all caps) as the whole project,
the commit message is ok, but it should clarify this is about the
separate vscclient executable.

Other then that ACK, I can send a pull request with the commit message
fixed as I suggested.

> 
> In libcacard/vsclient.c, g_byte_array_unref can be replaced by
> g_byte_array_free. This is not generally true, so adding a compatibility
> layer in include/glib-compat.h is no option here.
> 
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
> Reported-by: Don Slutz <dslutz@verizon.com>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> v2: Fix commit message and add missing parameter for g_byte_array_free.
> 
>  libcacard/vscclient.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
> index a3cb776..f1d46d3 100644
> --- a/libcacard/vscclient.c
> +++ b/libcacard/vscclient.c
> @@ -407,7 +407,7 @@ do_socket_read(GIOChannel *source,
>              }
>              break;
>          default:
> -            g_warn_if_reached();
> +            g_assert_not_reached();
>              return FALSE;
>          }
>  
> @@ -760,7 +760,7 @@ main(
>  
>      g_io_channel_unref(channel_stdin);
>      g_io_channel_unref(channel_socket);
> -    g_byte_array_unref(socket_to_send);
> +    g_byte_array_free(socket_to_send, TRUE);
>  
>      closesocket(sock);
>      return 0;
> 

Re: [Qemu-devel] [PATCH v2] libcacard: Fix compilation for older versions of glib (bug #1258168)

[Stefan Weil]

Am 08.12.2013 10:13, schrieb Alon Levy:
> On 12/05/2013 08:41 PM, Stefan Weil wrote:
>> See https://bugs.launchpad.net/bugs/1258168
>>
>> libcacard/vscclient.c: In function 'do_socket_read':
>> libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached'
>> libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached'
>> libcacard/vscclient.c: In function 'main':
>> libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref'
>> libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref'
>> ...
>> libcacard/vscclient.o: In function `do_socket_read':
>> libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached'
>> libcacard/vscclient.o: In function `main':
>> libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref'
>>
>> g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is
>> supported since glib 2.22. QEMU requires glib 2.12, so both names must
>> not be used.
>>
>> Instead of showing a warning for code which should not be reached, QEMU
>> better stops running, so g_warn_if_reached is not useful for QEMU.
> Just note that this fix is in vscclient, so this code is not part of
> qemu executable. If you are using QEMU (all caps) as the whole project,
> the commit message is ok, but it should clarify this is about the
> separate vscclient executable.
>
> Other then that ACK, I can send a pull request with the commit message
> fixed as I suggested.

Thanks for this hint. Please fix the commit message as you suggested.

Regards,
Stefan