From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 13 Feb 2008 16:20:09 +0000 (+0000)
Subject: Remove clone-and-hack qemu_malloc et al.
X-Git-Tag: xen-3.3.0-rc1~251
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ff347fdd3f33e42e91db49904af733082f97d775;p=qemu-xen-unstable.git

Remove clone-and-hack qemu_malloc et al.

qemu-img.c has copies of qemu_malloc et al, which are already provided
in osdep.c.  The attached patch removes these from qemu-img.c and
adds osdep.o to BLOCK_OBJS.
---

diff --git a/Makefile b/Makefile
index c36a97812a..a4417216a8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
 #######################################################################
 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
 
-BLOCK_OBJS=cutils.o
+BLOCK_OBJS=cutils.o osdep.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
 BLOCK_OBJS+=block-qcow2.o block-parallels.o
diff --git a/qemu-img.c b/qemu-img.c
index 4fc365db4c..309a746da7 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -30,41 +30,6 @@
 #include <windows.h>
 #endif
 
-void *get_mmap_addr(unsigned long size)
-{
-    return NULL;
-}
-
-void qemu_free(void *ptr)
-{
-    free(ptr);
-}
-
-void *qemu_malloc(size_t size)
-{
-    return malloc(size);
-}
-
-void *qemu_mallocz(size_t size)
-{
-    void *ptr;
-    ptr = qemu_malloc(size);
-    if (!ptr)
-        return NULL;
-    memset(ptr, 0, size);
-    return ptr;
-}
-
-char *qemu_strdup(const char *str)
-{
-    char *ptr;
-    ptr = qemu_malloc(strlen(str) + 1);
-    if (!ptr)
-        return NULL;
-    strcpy(ptr, str);
-    return ptr;
-}
-
 static void __attribute__((noreturn)) error(const char *fmt, ...)
 {
     va_list ap;