diff options
| author |   Avi Kivity <avi@qumranet.com> | 2008-05-05 12:14:07 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-05-05 16:46:43 +0300 |
| commit | ded723a3d5b4fcdb5f98a840ca97b50966e71264 (patch) | |
| tree | 71296659c8a17ef44d5c31268fecfd14323df8be /osdep.c | |
| parent | kvm: external module: adjust to div64_u64 rename (diff) | |
| parent | Qemu 32-bit i386, gcc >= 3.4 spill error fix (diff) | |
| download | qemu-kvm-ded723a3d5b4fcdb5f98a840ca97b50966e71264.tar.gz qemu-kvm-ded723a3d5b4fcdb5f98a840ca97b50966e71264.tar.bz2 qemu-kvm-ded723a3d5b4fcdb5f98a840ca97b50966e71264.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/configure
qemu/cpu-all.h
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/boards.h
qemu/hw/pc.c
qemu/hw/vga.c
qemu/monitor.c
qemu/osdep.c
qemu/pc-bios/bios.bin
qemu/sysemu.h
qemu/vl.c
Diffstat (limited to 'osdep.c')
| -rw-r--r-- | osdep.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -98,7 +98,6 @@ static void *kqemu_vmalloc(size_t size) int64_t free_space; int ram_mb; - extern int64_t ram_size; free_space = (int64_t)stfs.f_bavail * stfs.f_bsize; if ((ram_size + 8192 * 1024) >= free_space) { ram_mb = (ram_size / (1024 * 1024)); @@ -107,8 +106,7 @@ static void *kqemu_vmalloc(size_t size) tmpdir, ram_mb); if (strcmp(tmpdir, "/dev/shm") == 0) { fprintf(stderr, "To have more space available provided you have enough RAM and swap, do as root:\n" - "umount /dev/shm\n" - "mount -t tmpfs -o size=%dm none /dev/shm\n", + "mount -o remount,size=%dm /dev/shm\n", ram_mb + 16); } else { fprintf(stderr, |