From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 27 May 2008 13:34:18 +0000 (+0100)
Subject: Remove duplicated qemu_{malloc,free} and get_mmap_addr.
X-Git-Tag: xen-3.3.0-rc1~180^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3fb7b2db863ccd495a78e6ba5ac4c59e825ab021;p=qemu-xen-4.3-testing.git

Remove duplicated qemu_{malloc,free} and get_mmap_addr.

Related to apparently incomplete merge of:

 commit ca10f86763f58b7b3667e2ca7d26db3dc810eb20
 Author: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Date:   Fri Apr 11 21:35:42 2008 +0000

 Remove osdep.c/qemu-img code duplication

 (Kevin Wolf)

 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4191 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/osdep.c b/osdep.c
index 89ae73b65..c78dc2be5 100644
--- a/osdep.c
+++ b/osdep.c
@@ -46,21 +46,6 @@
 #include <malloc.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);
-}
-
 #define define_readwrite(rw, cnst)				\
 ssize_t qemu_##rw(int fd, cnst void *buf, size_t count) {	\
     ssize_t got, done;						\