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 c36a97812a6d94cf383c60a17ae69539dc0f1f18..a4417216a85c54894571f617aef3a8bc1a3b5e7c 100644 (file)
--- 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 4fc365db4c486b68b09f7e6abab77692aa77cdaa..309a746da7838cd84f6e1dc153efb8d2371de887 100644 (file)
--- 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;