diff options
| author |   Avi Kivity <avi@qumranet.com> | 2008-07-10 12:22:20 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-07-10 12:22:20 +0300 |
| commit | 9c2e8d239627662b3e0f2e7c5ea7ba2877101426 (patch) | |
| tree | 9c4b887eef0450f2647cd981e492440b0a284cd8 /osdep.c | |
| parent | kvm: testsuite: consilidate test libs to libcflat for single lib for all arch (diff) | |
| parent | Restore old value of buffer_size (diff) | |
| download | qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.tar.gz qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.tar.bz2 qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block-raw-posix.c
qemu/configure
qemu/exec.c
qemu/hw/pc.c
qemu/sysemu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'osdep.c')
| -rw-r--r-- | osdep.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -185,7 +185,11 @@ void *qemu_vmalloc(size_t size) #ifdef _BSD return valloc(size); #else - return memalign(TARGET_PAGE_SIZE, size); +#ifndef __ia64__ + return memalign(4096, size); +#else + return memalign(65536, size); +#endif #endif } |