From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TapqQ-0002wQ-J8 for qemu-devel@nongnu.org; Tue, 20 Nov 2012 10:34:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TapqH-0007vU-3W for qemu-devel@nongnu.org; Tue, 20 Nov 2012 10:34:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TapqG-0007vO-Rt for qemu-devel@nongnu.org; Tue, 20 Nov 2012 10:34:29 -0500 From: Stefan Hajnoczi Date: Tue, 20 Nov 2012 16:34:17 +0100 Message-Id: <1353425657-3237-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH] vdi: don't override libuuid symbols List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Weil , Stefan Hajnoczi , vbellur@redhat.com It's poor symbol hygiene to provide a global symbols that collide with a common library like libuuid. If QEMU links against a shared library that depends on uuid_generate() it can end up calling our stub version of the function. This exact scenario happened with GlusterFS libgfapi.so, which depends on libglusterfs.so's uuid_generate(). Scope the uuid stubs for vdi.c only and avoid affecting other shared objects. Signed-off-by: Stefan Hajnoczi --- block/vdi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index f35b12e..c8330b7 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -60,9 +60,6 @@ /* TODO: move uuid emulation to some central place in QEMU. */ #include "sysemu.h" /* UUID_FMT */ typedef unsigned char uuid_t[16]; -void uuid_generate(uuid_t out); -int uuid_is_null(const uuid_t uu); -void uuid_unparse(const uuid_t uu, char *out); #endif /* Code configuration options. */ @@ -124,18 +121,18 @@ void uuid_unparse(const uuid_t uu, char *out); #define VDI_IS_ALLOCATED(X) ((X) < VDI_DISCARDED) #if !defined(CONFIG_UUID) -void uuid_generate(uuid_t out) +static inline void uuid_generate(uuid_t out) { memset(out, 0, sizeof(uuid_t)); } -int uuid_is_null(const uuid_t uu) +static inline int uuid_is_null(const uuid_t uu) { uuid_t null_uuid = { 0 }; return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0; } -void uuid_unparse(const uuid_t uu, char *out) +static inline void uuid_unparse(const uuid_t uu, char *out) { snprintf(out, 37, UUID_FMT, uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7], -- 1.8.0