]> xenbits.xensource.com Git - qemu-xen-4.1-testing.git/commitdiff
Remove duplicated qemu_{malloc,free} and get_mmap_addr.
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 27 May 2008 13:34:18 +0000 (14:34 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 27 May 2008 13:34:18 +0000 (14:34 +0100)
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

osdep.c

diff --git a/osdep.c b/osdep.c
index 89ae73b65875cdda9e9988c0b715a723fcda250b..c78dc2be553091dd2226455e8a78f9b5972e2000 100644 (file)
--- a/osdep.c
+++ b/osdep.c
 #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;                                         \