diff options
author | 2008-04-16 12:42:11 +0300 | |
---|---|---|
committer | 2008-04-16 16:43:22 +0300 | |
commit | 06335f9e1ee27cf0d36863b20defe9afca8e88c1 (patch) | |
tree | d54c1155b8bf1a2797d5a9eed9f66ff1d8e1c08c /osdep.c | |
parent | Fix reset with iothread (diff) | |
parent | Nokia N800 machine support (ARM). (diff) | |
download | qemu-kvm-06335f9e1ee27cf0d36863b20defe9afca8e88c1.tar.gz qemu-kvm-06335f9e1ee27cf0d36863b20defe9afca8e88c1.tar.bz2 qemu-kvm-06335f9e1ee27cf0d36863b20defe9afca8e88c1.zip |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/cutils.c
qemu/exec.c
qemu/hw/acpi.c
qemu/hw/apic.c
qemu/hw/ide.c
qemu/hw/pc.c
qemu/monitor.c
qemu/pc-bios/bios.bin
qemu/pc-bios/bios.diff
qemu/qemu-img.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'osdep.c')
-rw-r--r-- | osdep.c | 35 |
1 files changed, 0 insertions, 35 deletions
@@ -45,21 +45,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); -} - #if defined(_WIN32) void *qemu_memalign(size_t alignment, size_t size) { @@ -217,26 +202,6 @@ void qemu_vfree(void *ptr) #endif -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; -} - int qemu_create_pidfile(const char *filename) { char buffer[128]; |