lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[scripts][x86] spiff up the qemu x86 script to handle a virtio disk and net device

Browse Source
This commit is contained in:
Travis Geiselbrecht
2021-11-09 00:29:57 -08:00
parent a2b41c11d2
commit 6fec0cb2bf
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/do-qemux86
View File

@@ -8,6 +8,8 @@ function HELP {
echo "-l : legacy mode build (386 emulated machine)" echo "-l : legacy mode build (386 emulated machine)"
echo "-m <memory in MB>" echo "-m <memory in MB>"
echo "-s <number of cpus>" echo "-s <number of cpus>"
echo "-d <disk image> : a virtio block device"
echo "-n : a virtio network device"
echo "-g : with graphics" echo "-g : with graphics"
echo "-k : use KVM" echo "-k : use KVM"
echo "-h for help" echo "-h for help"
@@ -19,18 +21,23 @@ DO_64BIT=0
DO_LEGACY=0 DO_LEGACY=0
DO_GRAPHICS=0 DO_GRAPHICS=0
DO_KVM=0 DO_KVM=0
DO_DISK=0
DISK_IMAGE=""
DO_NET=0
MEMSIZE=0 MEMSIZE=0
SMP=1 SMP=1
SUDO="" SUDO=""
MAKE_VARS="" MAKE_VARS=""
while getopts 6gklm:s:h FLAG; do while getopts 6d:gklm:ns:h FLAG; do
case $FLAG in case $FLAG in
6) DO_64BIT=1;; 6) DO_64BIT=1;;
d) DO_DISK=1; DISK_IMAGE=$OPTARG;;
g) DO_GRAPHICS=1;; g) DO_GRAPHICS=1;;
k) DO_KVM=1;; k) DO_KVM=1;;
l) DO_LEGACY=1;; l) DO_LEGACY=1;;
m) MEMSIZE=$OPTARG;; m) MEMSIZE=$OPTARG;;
n) DO_NET=1;;
s) SMP=$OPTARG;; s) SMP=$OPTARG;;
h) HELP;; h) HELP;;
\?) \?)
@@ -56,7 +63,7 @@ else
QEMU="qemu-system-i386" QEMU="qemu-system-i386"
PROJECT="pc-x86-test" PROJECT="pc-x86-test"
CPU=qemu32 CPU=qemu32
MACHINE=pc MACHINE=q35
fi fi
if (( $DO_LEGACY )); then if (( $DO_LEGACY )); then
@@ -69,16 +76,41 @@ else
fi fi
fi fi
ARGS=" -cpu $CPU -m $MEMSIZE -smp $SMP -machine $MACHINE -kernel build-${PROJECT}/lk.elf" ARGS=""
if (( $DO_KVM )); then
ARGS+=" -enable-kvm -cpu host"
else
ARGS+=" -cpu $CPU"
fi
ARGS+=" -m $MEMSIZE -smp $SMP -machine $MACHINE -kernel build-${PROJECT}/lk.elf"
ARGS+=" -device isa-debug-exit,iobase=0xf4,iosize=0x04"
# Override the SeaBIOS serial port to keep it from outputting
# a terminal reset on start.
ARGS+=" -fw_cfg name=etc/sercon-port,string=0"
if (( ! $DO_GRAPHICS )); then if (( ! $DO_GRAPHICS )); then
ARGS+=" -nographic" ARGS+=" -nographic"
else else
ARGS+=" -serial stdio" ARGS+=" -serial stdio -vga std"
fi fi
if (( $DO_KVM )); then if (( $DO_DISK )); then
ARGS+=" -enable-kvm -cpu host" if (( ! $DO_LEGACY )); then
ARGS+=" -drive if=none,file=${DISK_IMAGE},id=blk -device virtio-blk-pci,drive=blk"
else
ARGS+=" -hda ${DISK_IMAGE}"
fi
fi
if (( $DO_NET )); then
if (( ! $DO_LEGACY )); then
ARGS+=" -netdev user,id=vmnic,hostname=qemu -device virtio-net-pci,netdev=vmnic"
else
echo "implement legacy + network config"
exit 1
fi
else
ARGS+=" -nic none"
fi fi
$DIR/make-parallel $MAKE_VARS $PROJECT && $DIR/make-parallel $MAKE_VARS $PROJECT &&