From d8490b312038118e7214a203dab745d2e921b405 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Sat, 21 Mar 2020 16:59:45 +0000
Subject: [PATCH] Reorder boot string to logically group components

---
 quickemu | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/quickemu b/quickemu
index e36ba35..d888a3b 100755
--- a/quickemu
+++ b/quickemu
@@ -270,29 +270,23 @@ function vm_boot() {
   fi
 
   # Boot the iso image
-  ${QEMU} -name ${VMNAME},process=${VMNAME} \
-    ${BIOS} ${GUEST_TWEAKS} \
+  ${QEMU} \
+    -name ${VMNAME},process=${VMNAME} \
+    -enable-kvm -machine q35 ${BIOS} ${GUEST_TWEAKS} \
+    ${CPU} -smp ${CORES_VM} \
+    -m ${RAM_VM} -device virtio-balloon \
     -drive if=none,id=drive0,cache=directsync,aio=native,format=qcow2,file=${disk_img} \
-    -device virtio-blk-pci,drive=drive0,scsi=off \
+    -device virtio-blk-pci,drive=drive0,scsi=off ${STATUS_QUO} \
     ${ISO_BOOT} ${ISO_DRIVER} \
-    -enable-kvm \
-    -machine q35 \
-    ${CPU} \
-    -smp ${CORES_VM} \
-    -m ${RAM_VM} \
-    -device virtio-balloon \
-    -netdev ${NET},id=nic \
-    -device virtio-net,netdev=nic \
-    -rtc base=localtime,clock=host \
-    -serial mon:stdio \
+    ${VIDEO} -display ${OUTPUT},gl=${GL}${OUTPUT_EXTRA} \
+    -device qemu-xhci,id=xhci,p2=8,p3=8 -device usb-kbd -device usb-tablet \
+    -device virtio-net,netdev=nic -netdev ${NET},id=nic \
     -audiodev pa,id=pa,server=unix:${XDG_RUNTIME_DIR}/pulse/native,out.stream-name=${LAUNCHER}-${VMNAME},in.stream-name=${LAUNCHER}-${VMNAME} \
     -device intel-hda -device hda-duplex,audiodev=pa,mixer=off \
-    -device qemu-xhci,id=xhci,p2=8,p3=8 -device usb-kbd -device usb-tablet \
+    -rtc base=localtime,clock=host \
     -object rng-random,id=rng0,filename=/dev/urandom \
     -device virtio-rng-pci,rng=rng0 \
-    ${VIDEO_DEV} \
-    -display ${OUTPUT},gl=${GL} \
-    ${STATUS_QUO} \
+    -serial mon:stdio \
     "$@"
 }