mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-25 19:02:07 -05:00
2a4a19aed8
During initialization of PCI MMIO access mechanism we ensure that we have an allocation from the kernel virtual address space that cannot be taken by other components in the OS. Also, now we ensure that interrupts are disabled so mapping the region doesn't fail. In order to reduce overhead, map_device() will map the requested PCI address only if it's not mapped already. The run script has been changed so now we can boot a Q35 machine, that supports PCI ECAM. To ensure we will be able to load the machine, a PIIX3 IDE controller was added to the Q35 machine configuration in the run script. An AHCI controller was added to the i440fx machine configuration.
114 lines
3.5 KiB
Bash
Executable file
114 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
|
cd "$script_path"
|
|
|
|
#SERENITY_PACKET_LOGGING_ARG="-object filter-dump,id=hue,netdev=breh,file=e1000.pcap"
|
|
|
|
[ -e /dev/kvm -a -r /dev/kvm -a -w /dev/kvm ] && SERENITY_KVM_ARG="-enable-kvm"
|
|
|
|
[ -z "$SERENITY_BOCHS_BIN" ] && SERENITY_BOCHS_BIN="bochs"
|
|
|
|
[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386"
|
|
|
|
[ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"
|
|
|
|
[ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=128M
|
|
|
|
[ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS="
|
|
$SERENITY_EXTRA_QEMU_ARGS
|
|
-s -m $SERENITY_RAM_SIZE
|
|
-cpu max
|
|
-d cpu_reset,guest_errors
|
|
-device VGA,vgamem_mb=64
|
|
-hda _disk_image
|
|
-device ich9-ahci
|
|
-debugcon stdio
|
|
-soundhw pcspk
|
|
-soundhw sb16
|
|
"
|
|
|
|
[ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS="
|
|
$SERENITY_EXTRA_QEMU_ARGS
|
|
-s -m $SERENITY_RAM_SIZE
|
|
-cpu max
|
|
-machine q35
|
|
-d cpu_reset,guest_errors
|
|
-device VGA,vgamem_mb=64
|
|
-device piix3-ide
|
|
-drive file=_disk_image,id=disk,if=none
|
|
-device ide-hd,bus=ide.6,drive=disk,unit=0
|
|
-debugcon stdio
|
|
-soundhw pcspk
|
|
-soundhw sb16
|
|
"
|
|
|
|
export SDL_VIDEO_X11_DGAMOUSE=0
|
|
|
|
if [ "$1" = "b" ]; then
|
|
# ./run b: bochs
|
|
$SERENITY_BOCHS_BIN -q -f .bochsrc
|
|
elif [ "$1" = "qn" ]; then
|
|
# ./run qn: qemu without network
|
|
$SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_ARGS \
|
|
-device e1000 \
|
|
-kernel kernel \
|
|
-append "${SERENITY_KERNEL_CMDLINE}"
|
|
elif [ "$1" = "qtap" ]; then
|
|
# ./run qtap: qemu with tap
|
|
sudo $SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_ARGS \
|
|
$SERENITY_KVM_ARG \
|
|
$SERENITY_PACKET_LOGGING_ARG \
|
|
-netdev tap,ifname=tap0,id=br0 \
|
|
-device e1000,netdev=br0 \
|
|
-kernel kernel \
|
|
-append "${SERENITY_KERNEL_CMDLINE}"
|
|
elif [ "$1" = "qgrub" ]; then
|
|
# ./run qgrub: qemu with grub
|
|
$SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_ARGS \
|
|
$SERENITY_KVM_ARG \
|
|
$SERENITY_PACKET_LOGGING_ARG \
|
|
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \
|
|
-device e1000,netdev=breh
|
|
elif [ "$1" = "q35_cmd" ]; then
|
|
SERENITY_KERNEL_CMDLINE=""
|
|
# FIXME: Someone who knows sh syntax better, please help:
|
|
for i in `seq 2 $#`; do
|
|
shift
|
|
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1"
|
|
done
|
|
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
|
|
# ./run: qemu with SerenityOS with custom commandline
|
|
$SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_Q35_ARGS \
|
|
-device e1000 \
|
|
-kernel kernel \
|
|
-append "${SERENITY_KERNEL_CMDLINE}"
|
|
elif [ "$1" = "qcmd" ]; then
|
|
SERENITY_KERNEL_CMDLINE=""
|
|
# FIXME: Someone who knows sh syntax better, please help:
|
|
for i in `seq 2 $#`; do
|
|
shift
|
|
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1"
|
|
done
|
|
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
|
|
# ./run: qemu with SerenityOS with custom commandline
|
|
$SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_ARGS \
|
|
-device e1000 \
|
|
-kernel kernel \
|
|
-append "${SERENITY_KERNEL_CMDLINE}"
|
|
else
|
|
# ./run: qemu with user networking
|
|
$SERENITY_QEMU_BIN \
|
|
$SERENITY_COMMON_QEMU_ARGS \
|
|
$SERENITY_KVM_ARG \
|
|
$SERENITY_PACKET_LOGGING_ARG \
|
|
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \
|
|
-device e1000,netdev=breh \
|
|
-kernel kernel \
|
|
-append "${SERENITY_KERNEL_CMDLINE}"
|
|
fi
|