OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

libvhost-user: drop dependency on glib

Browse Source 
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 <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Marc-André Lureau 2017-08-11 01:14:38 +02:00
parent d59a031c7e
commit eb078a9f0c
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/libvhost-user/libvhost-user.c
View File

@ -13,14 +13,35 @@
* later. See the COPYING file in the top-level directory. * later. See the COPYING file in the top-level directory.
*/ */
#include <qemu/osdep.h> /* this code avoids GLib dependency */
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdarg.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include <inttypes.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <sys/mman.h>
#include <linux/vhost.h> #include <linux/vhost.h>
#include "qemu/compiler.h"
#include "qemu/atomic.h" #include "qemu/atomic.h"
#include "libvhost-user.h" #include "libvhost-user.h"
/* usually provided by GLib */
#ifndef MIN
#define MIN(x, y) ({ \
typeof(x) _min1 = (x); \
typeof(y) _min2 = (y); \
(void) (&_min1 == &_min2); \
_min1 < _min2 ? _min1 : _min2; })
#endif
#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
/* The version of the protocol we support */ /* The version of the protocol we support */
@ -81,7 +102,9 @@ vu_panic(VuDev *dev, const char *msg, ...)
va_list ap; va_list ap;
va_start(ap, msg); va_start(ap, msg);
buf = g_strdup_vprintf(msg, ap); if (vasprintf(&buf, msg, ap) < 0) {
buf = NULL;
}
va_end(ap); va_end(ap);
dev->broken = true; dev->broken = true;
@ -853,7 +876,7 @@ vu_dispatch(VuDev *dev)
success = true; success = true;
end: end:
g_free(vmsg.data); free(vmsg.data);
return success; return success;
} }