diff options
| author |   Avi Kivity <avi@redhat.com> | 2008-12-15 18:14:37 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-15 18:17:52 +0200 |
| commit | 0fe025d5acad3313d8ba8ce267e6dbf995226de2 (patch) | |
| tree | cda8e541cfc754ff323ccae2447da126ac729ef0 /osdep.c | |
| parent | kvm: external module: add msr-index.h, now needed by kvm_host.h (diff) | |
| parent | target-ppc: add signed fields to ppc_avr_t. (diff) | |
| download | qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.tar.gz qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.tar.bz2 qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/configure
qemu/cutils.c
qemu/dyngen.c
qemu/hw/cirrus_vga.c
qemu/hw/e1000.c
qemu/hw/pci.c
qemu/hw/vga.c
qemu/osdep.c
qemu/pc-bios/Makefile
qemu/qemu-common.h
qemu/target-ppc/helper.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'osdep.c')
| -rw-r--r-- | osdep.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -200,15 +200,11 @@ void *qemu_vmalloc(size_t size) if (kqemu_allowed) return kqemu_vmalloc(size); #endif -#ifdef _BSD - return valloc(size); -#else #ifndef __ia64__ return qemu_memalign(getpagesize(), size); #else return qemu_memalign(65536, size); #endif -#endif } void qemu_vfree(void *ptr) |