Skip kernel-irqchip=off when installing with --install-from-img
Move the setting from qemu/windows11-darwin-arm64.ini to a -machine option that run-windows11.py adds on macOS arm64 unless --install-from-img is given. The workaround is only needed for usb-storage, which the NVMe install disk does not use, and Setup hangs with the emulated interrupt controller. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
887da87340
commit
07a2c6db3e
3 files changed
+11
-6
No files matched your search
@@ -461,6 +461,14 @@ qemu_args += [
|
||||
"-display", display_backend,
|
||||
# "-display", "none", "-spice", "port=5900,addr=127.0.0.1,disable-ticketing=on,agent-mouse=off", "-device", "virtio-vga",
|
||||
]
|
||||
if host_os == "darwin" and host_arch == "arm64" and not install_from_img:
|
||||
# With the HVF in-kernel GICv3, QEMU's usb-storage races on the status
|
||||
# packet and Windows Setup stalls 10 s after every burst of reads
|
||||
# (utmapp/UTM#7970), so use the emulated interrupt controller; upstream
|
||||
# QEMU only gets the fix from the UTM fork. The NVMe install disk of
|
||||
# --install-from-img does not use usb-storage, and hangs with the emulated
|
||||
# controller.
|
||||
qemu_args += ["-machine", "kernel-irqchip=off"]
|
||||
if installing_from_iso:
|
||||
# q35 has IDE for the installation media; "virt" does not, so use USB.
|
||||
for media_id, media_file, boot_index, ide_bus in (
|
||||
|
||||
Reference in new issue
Block a user