From 68218b9312bf91fcd937ee29b84cbbf490083620 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 20 Apr 2018 10:26:31 +0000 Subject: Fix qemu-boot (thanks rain1) --- qemu-boot | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qemu-boot b/qemu-boot index 6fc6cf0..b91d8e7 100755 --- a/qemu-boot +++ b/qemu-boot @@ -11,28 +11,28 @@ case "$QEMU_ARCH" in qemu_sysoptions="-smp 2 -m 500M" qemu_console=ttyS0 nic=e1000 - diskoption="-drive file=$OUTPUT/disk-image.raw,media=disk,format=raw,if=none,id=sata0 -device ich9-ahci,id=ahci -device ide-drive,drive=sata0,bus=ahci.0" ;; - rootpartition=/dev/sda1 + diskoption="-drive file=$OUTPUT/disk-image.raw,media=disk,format=raw,if=none,id=sata0 -device ich9-ahci,id=ahci -device ide-drive,drive=sata0,bus=ahci.0" + rootpartition=/dev/sda1 ;; x86_64) qemu_sysoptions="-enable-kvm -cpu host -smp 4 -m 500M" qemu_console=ttyS0 nic=e1000 virtioblk=virtio-blk-pci virtionet=virtio-net-pci - diskoption="-drive file=$OUTPUT/disk-image.raw,media=disk,format=raw,if=none,id=sata0 -device ich9-ahci,id=ahci -device ide-drive,drive=sata0,bus=ahci.0" ;; - rootpartition=/dev/sda1 + diskoption="-drive file=$OUTPUT/disk-image.raw,media=disk,format=raw,if=none,id=sata0 -device ich9-ahci,id=ahci -device ide-drive,drive=sata0,bus=ahci.0" + rootpartition=/dev/sda1 ;; arm) qemu_sysoptions="-m 500M -M vexpress-a9 -cpu cortex-a9 -dtb sub/disk-image/vexpress-v2p-ca9.dtb" qemu_console=ttyAMA0 USE_VIRTIO_NETWORK=true # we only support virtio on armv7 - diskoption="-sd $OUTPUT/disk-image.raw" ;; - rootpartition=/dev/hda1 + diskoption="-sd $OUTPUT/disk-image.raw" + rootpartition=/dev/hda1 ;; aarch64) qemu_sysoptions="-M virt -cpu cortex-a57 -m 500M" qemu_console=ttyAMA0 USE_VIRTIO_NETWORK=true # we only support virtio on armv8 - diskoption="-device sdhci-pci -device sd-card,drive=sdcard -drive file=$OUTPUT/disk-image.raw,id=sdcard,cache=unsafe,if=none,format=raw" ;; - rootpartition=/dev/hda1 + diskoption="-device sdhci-pci -device sd-card,drive=sdcard -drive file=$OUTPUT/disk-image.raw,id=sdcard,cache=unsafe,if=none,format=raw" + rootpartition=/dev/hda1 ;; esac nographic=-nographic -- cgit v1.2.3