tools/qemu.sh: remove GRUB dependency

This change makes QEMU directly boot the kernel, using the -kernel option.

1 files changed, 3 insertions, 13 deletions

diff --git a/tools/qemu.sh b/tools/qemu.sh
index 1e1990b..3aef63e 100755
--- a/tools/qemu.sh
+++ b/tools/qemu.sh
@@ -22,18 +22,8 @@ KVM="-enable-kvm -cpu host"
 
 X15=$PWD/x15
 TMPDIR=$(mktemp -d)
-CDROOT=$TMPDIR/cdroot
 
-mkdir -p $CDROOT/boot/grub
-cp $X15 $CDROOT/boot
-cat > $CDROOT/boot/grub/grub.cfg << EOF
-set timeout=1
-
-menuentry "X15" --class os {
-        multiboot (hd96)/boot/x15 root=device:hd1s8
-}
-EOF
-grub-mkrescue -o $TMPDIR/grub.iso $CDROOT
+objcopy -O elf32-i386 $X15 $TMPDIR/x15
 
 $QEMU_EXE $KVM \
           -ctrl-grab \
@@ -41,7 +31,7 @@ $QEMU_EXE $KVM \
           -m $RAM \
           -smp $NR_CPUS \
           -monitor stdio \
-          -cdrom $TMPDIR/grub.iso \
-          -boot d
+          -kernel $TMPDIR/x15 \
+          -append "console=atcons"
 
 rm -rf $TMPDIR