From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drlAn-0000se-R3 for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drlAh-0005Cm-IU for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:24:17 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:38004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1drlAh-0005Cb-EY for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:24:11 -0400 Received: by mail-qk0-x242.google.com with SMTP id c69so7163404qke.5 for ; Tue, 12 Sep 2017 06:24:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <20170823162004.27337-1-marcandre.lureau@redhat.com> <20170823162004.27337-3-marcandre.lureau@redhat.com> <1091717998.13779657.1505221996382.JavaMail.zimbra@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <4426cb39-3c78-6b74-cf74-f5c587807bff@amsat.org> Date: Tue, 12 Sep 2017 10:24:03 -0300 MIME-Version: 1.0 In-Reply-To: <1091717998.13779657.1505221996382.JavaMail.zimbra@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 02/27] libvhost-user: drop dependency on glib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= Cc: qemu-devel@nongnu.org, changpeng liu , felipe@nutanix.com On 09/12/2017 10:13 AM, Marc-André Lureau wrote: > Hi > > ----- Original Message ----- >> Hi Marc-André, >> >> On 08/23/2017 01:19 PM, Marc-André Lureau wrote: >>> libvhost-user is meant to be free of glib dependency. Make sure it is >>> by droping qemu/osdep.h (which included glib.h) >>> >>> This fixes a bad malloc()/g_free() pair. >>> >>> Signed-off-by: Marc-André Lureau >>> --- >>> contrib/libvhost-user/libvhost-user.c | 25 ++++++++++++++++++++++--- >>> 1 file changed, 22 insertions(+), 3 deletions(-) >>> >>> diff --git a/contrib/libvhost-user/libvhost-user.c >>> b/contrib/libvhost-user/libvhost-user.c >>> index 35fa0c5e56..bb294c6ef7 100644 >>> --- a/contrib/libvhost-user/libvhost-user.c >>> +++ b/contrib/libvhost-user/libvhost-user.c >>> @@ -13,11 +13,22 @@ >>> * later. See the COPYING file in the top-level directory. >>> */ >>> /* this code avoids GLib dependency */ >>> -#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> #include >>> +#include >>> #include >>> >>> #include "qemu/atomic.h" >>> +#include "qemu/compiler.h" >>> >>> #include "libvhost-user.h" >>> >>> @@ -34,6 +45,14 @@ >>> } \ >>> } while (0) >>> >>> +#ifndef MIN /* usually provided by GLib */ >>> +#define MIN(x, y) ({ \ >>> + typeof(x) _min1 = (x); \ >>> + typeof(y) _min2 = (y); \ >>> + (void) (&_min1 == &_min2); \ >>> + _min1 < _min2 ? _min1 : _min2; }) >> >> why not add this in qemu/compiler.h instead? > > It's a special case here, because libvhost-user doesn't depend on glib. The rest of qemu does. Since MIN/MAX is defined by glib, I don't think qemu/compiler.h should define it. OK, with some comments about GLib Independence: Reviewed-by: Philippe Mathieu-Daudé > >> >>> +#endif >>> + >>> static const char * >>> vu_request_to_string(int req) >>> { >>> @@ -81,7 +100,7 @@ vu_panic(VuDev *dev, const char *msg, ...) >>> va_list ap; >>> >>> va_start(ap, msg); >>> - buf = g_strdup_vprintf(msg, ap); >>> + vasprintf(&buf, msg, ap); >>> va_end(ap); >>> >>> dev->broken = true; >>> @@ -840,7 +859,7 @@ vu_dispatch(VuDev *dev) >>> success = true; >>> >>> end: >>> - g_free(vmsg.data); >>> + free(vmsg.data); >>> return success; >>> } >>> >>> >>