AIR/quickemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "macOS: swap disk controller from virtio-blk-pci to ahci"

Browse Source 
This reverts commit 881adb289a.
This commit is contained in:
Dani Llewellyn 2022-10-17 20:25:42 +01:00 committed by Martin Wimpress
parent 332f5b59f9
commit 9a7ee71804
No known key found for this signature in database
GPG Key ID: 61DF940515E06DA3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
quickemu
View File

@ -542,13 +542,13 @@ function vm_boot() {
case ${macos_release} in case ${macos_release} in
catalina) catalina)
BALLOON="" BALLOON=""
MAC_DISK_DEV="ide-hd,bus=ahci.2" MAC_DISK_DEV="virtio-blk-pci"
NET_DEVICE="vmxnet3" NET_DEVICE="vmxnet3"
USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci" USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci"
;; ;;
big-sur|monterey|ventura) big-sur|monterey|ventura)
BALLOON="-device virtio-balloon" BALLOON="-device virtio-balloon"
MAC_DISK_DEV="ide-hd,bus=ahci.2" MAC_DISK_DEV="virtio-blk-pci"
NET_DEVICE="virtio-net" NET_DEVICE="virtio-net"
USB_HOST_PASSTHROUGH_CONTROLLER="nec-usb-xhci" USB_HOST_PASSTHROUGH_CONTROLLER="nec-usb-xhci"
GUEST_TWEAKS="${GUEST_TWEAKS} -global nec-usb-xhci.msi=off" GUEST_TWEAKS="${GUEST_TWEAKS} -global nec-usb-xhci.msi=off"
@ -1071,19 +1071,18 @@ 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
-device ide-hd,bus=ahci.0,drive=BootLoader,bootindex=0,rotation_rate=1 -device ide-hd,bus=ahci.0,drive=BootLoader,bootindex=0
-drive id=BootLoader,if=none,format=qcow2,discard=unmap,file="${MAC_BOOTLOADER}") -drive id=BootLoader,if=none,format=qcow2,file="${MAC_BOOTLOADER}")
if [ -n "${img}" ]; then if [ -n "${img}" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device ide-hd,bus=ahci.1,drive=RecoveryImage,rotation_rate=1 args+=(-device ide-hd,bus=ahci.1,drive=RecoveryImage
-drive id=RecoveryImage,if=none,format=raw,discard=unmap,file="${img}") -drive id=RecoveryImage,if=none,format=raw,file="${img}")
fi fi
# shellcheck disable=SC2054,SC2206 # shellcheck disable=SC2054,SC2206
args+=(-device ${MAC_DISK_DEV},drive=SystemDisk,rotation_rate=1 args+=(-device ${MAC_DISK_DEV},drive=SystemDisk
-drive id=SystemDisk,if=none,format=qcow2,discard=unmap,file="${disk_img}" ${STATUS_QUO}) -drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" ${STATUS_QUO})
elif [ "${guest_os}" == "kolibrios" ]; then elif [ "${guest_os}" == "kolibrios" ]; then
# shellcheck disable=SC2054,SC2206 # shellcheck disable=SC2054,SC2206
args+=(-device ahci,id=ahci args+=(-device ahci,id=ahci