qemu -machine q35; boot disk is now SATA
This commit is contained in:
parent
65e522c267
commit
dc76ef757f
2 changed files with 7 additions and 28 deletions
|
|
@ -1,25 +1,3 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# debug-run-qemu.sh
|
||||
# Launch QEMU with four vCPUs and a GDB stub on TCP port 3117.
|
||||
#!/bin/sh
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
QEMU_OPTS=""
|
||||
|
||||
# ATA drive with EFI partition, incl. bootloader & kernel
|
||||
QEMU_OPTS="$QEMU_OPTS -drive if=ide,format=raw,file=build/disk.img"
|
||||
|
||||
# SATA drive
|
||||
QEMU_OPTS="$QEMU_OPTS -drive id=disk,format=raw,file=drive.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0,serial=DEADBEEF"
|
||||
|
||||
# VIRTIO drive
|
||||
QEMU_OPTS="$QEMU_OPTS -drive file=drive-virtio.img,format=raw,if=virtio"
|
||||
|
||||
# Multicore
|
||||
QEMU_OPTS="$QEMU_OPTS -smp sockets=1,cores=2,threads=1"
|
||||
|
||||
# Debug Options
|
||||
QEMU_OPTS="$QEMU_OPTS -d int -S -gdb tcp::3117"
|
||||
|
||||
qemu-system-x86_64 $QEMU_OPTS "$@"
|
||||
./run-qemu.sh -d int -S -gdb tcp::3117
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@
|
|||
|
||||
QEMU_OPTS=""
|
||||
|
||||
# ATA drive with EFI partition, incl. bootloader & kernel
|
||||
QEMU_OPTS="$QEMU_OPTS -drive if=ide,format=raw,file=build/disk.img"
|
||||
|
||||
# SATA drive
|
||||
QEMU_OPTS="$QEMU_OPTS -drive id=disk,format=raw,file=drive.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0,serial=DEADBEEF"
|
||||
QEMU_OPTS="$QEMU_OPTS -device ahci,id=ahci"
|
||||
QEMU_OPTS="$QEMU_OPTS -drive id=bootdisk,format=raw,file=build/disk.img,if=none -device ide-hd,drive=bootdisk,bus=ahci.0,serial=DEADBEE0"
|
||||
QEMU_OPTS="$QEMU_OPTS -drive id=disk,format=raw,file=drive.img,if=none -device ide-hd,drive=disk,bus=ahci.1,serial=DEADBEEF"
|
||||
|
||||
# VIRTIO drive
|
||||
QEMU_OPTS="$QEMU_OPTS -drive file=drive-virtio.img,format=raw,if=virtio"
|
||||
|
|
@ -14,4 +13,6 @@ QEMU_OPTS="$QEMU_OPTS -drive file=drive-virtio.img,format=raw,if=virtio"
|
|||
# Multicore
|
||||
QEMU_OPTS="$QEMU_OPTS -smp sockets=1,cores=2,threads=1"
|
||||
|
||||
QEMU_OPTS="$QEMU_OPTS -machine q35"
|
||||
|
||||
qemu-system-x86_64 $QEMU_OPTS "$@"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue