diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-03-27 13:02:29 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-03-27 13:02:29 +0100 |
| commit | 580832255668fe50749b1d62db1208315b82c62d (patch) | |
| tree | 3bcdddb4f3acbf39213f395b65d0c215000c7be9 | |
| parent | 1577217ce13a8e2889f54f5568a98a32573df2e0 (diff) | |
| download | serenity-580832255668fe50749b1d62db1208315b82c62d.zip | |
Give the emulator testing environments 128 MB of RAM.
I'm working on porting GCC and it needs a fair bit of memory to run.
| -rw-r--r-- | Kernel/.bochsrc | 2 | ||||
| -rwxr-xr-x | Kernel/run | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Kernel/.bochsrc b/Kernel/.bochsrc index 778814ecde..fd215498d8 100644 --- a/Kernel/.bochsrc +++ b/Kernel/.bochsrc @@ -1,7 +1,7 @@ # configuration file generated by Bochs config_interface: textconfig display_library: x -memory: host=32, guest=32 +memory: host=128, guest=128 romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest" boot: floppy diff --git a/Kernel/run b/Kernel/run index 5d562bdcc0..b380e46321 100755 --- a/Kernel/run +++ b/Kernel/run @@ -1,17 +1,19 @@ #!/bin/sh +ram_size=128 + if [ "$1" = "b" ]; then # ./run b: bochs bochs -q -f .bochsrc elif [ "$1" = "qn" ]; then # ./run qn: qemu without network - qemu-system-i386 -s -m 32 -device e1000 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@ + qemu-system-i386 -s -m $ram_size -device e1000 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@ elif [ "$1" = "qtap" ]; then # ./run qtap: qemu with tap - sudo qemu-system-i386 -s -m 32 -object filter-dump,id=hue,netdev=br0,file=e1000.pcap -netdev tap,ifname=tap0,id=br0 -device e1000,netdev=br0 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents + sudo qemu-system-i386 -s -m $ram_size -object filter-dump,id=hue,netdev=br0,file=e1000.pcap -netdev tap,ifname=tap0,id=br0 -device e1000,netdev=br0 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents else # ./run: qemu with user networking - qemu-system-i386 -s -m 32 \ + qemu-system-i386 -s -m $ram_size \ -object filter-dump,id=hue,netdev=breh,file=e1000.pcap \ -netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-192.168.5.2:8888 \ -device e1000,netdev=breh \ |