Minor disk configuration refactor

This commit is contained in:
Martin Wimpress 2021-09-28 15:50:24 +01:00
parent c83b0ff7fc
commit 4f68841daa
No known key found for this signature in database
GPG Key ID: 61DF940515E06DA3
1 changed files with 6 additions and 8 deletions

View File

@ -493,12 +493,12 @@ function vm_boot() {
if [ "${guest_os}" == "macos" ]; then if [ "${guest_os}" == "macos" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device ahci,id=ahci args+=(-device ahci,id=ahci
-drive id=OpenCore,if=none,format=qcow2,file="${VMDIR}/OpenCore.qcow2" -device ide-hd,bus=ahci.0,drive=OpenCore
-device ide-hd,bus=ahci.0,drive=OpenCore) -drive id=OpenCore,if=none,format=qcow2,file="${VMDIR}/OpenCore.qcow2")
if [ -n "${img}" ]; then if [ -n "${img}" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-drive id=InstallMedia,if=none,format=raw,file="${img}" args+=(-device ide-hd,bus=ahci.1,drive=InstallMedia
-device ide-hd,bus=ahci.1,drive=InstallMedia) -drive id=InstallMedia,if=none,format=raw,file="${img}")
fi fi
if [ "${virtio_blk}" == "on" ]; then if [ "${virtio_blk}" == "on" ]; then
@ -527,10 +527,8 @@ function vm_boot() {
fi fi
# shellcheck disable=SC2054,SC2206 # shellcheck disable=SC2054,SC2206
args+=( args+=(-device virtio-blk-pci,drive=drive0,scsi=off
-device virtio-blk-pci,drive=drive0,scsi=off -drive id=drive0,if=none,cache=directsync,aio=native,format=qcow2,file="${disk_img}" ${STATUS_QUO}
-drive id=drive0,if=none,cache=directsync,aio=native,format=qcow2,file="${disk_img}"
-device virtio-blk-pci,drive=drive0,scsi=off ${STATUS_QUO}
-device qemu-xhci,id=spicepass -device qemu-xhci,id=spicepass
-chardev spicevmc,id=usbredirchardev1,name=usbredir -chardev spicevmc,id=usbredirchardev1,name=usbredir
-device usb-redir,chardev=usbredirchardev1,id=usbredirdev1 -device usb-redir,chardev=usbredirchardev1,id=usbredirdev1