From 94c995e38d77c39e64237e086ab47dc80313fd77 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 1 Mar 2026 16:43:01 +0100
Subject: [PATCH] Use nvme by default outside of 32bit x86 and raspi

Most modern systems use nvme as disk. 32bit x86 is a legacy system where
ata is likely still used. Raspberry PI uses the sdcard.
---
 mk/qemu.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/qemu.mk b/mk/qemu.mk
index 6e1f0742f..6be8cdfe4 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -8,6 +8,7 @@ VGA_SUPPORTED=no
 
 ifeq ($(ARCH),i586)
 	audio?=ac97
+	disk?=ata
 	gpu?=vga
 	uefi=no
 	VGA_SUPPORTED=yes
@@ -104,7 +105,6 @@ else ifeq ($(ARCH),riscv64gc)
 	QEMU_SMP?=4
 	QEMU_MEM?=2048
 	QEMU_CPU=max
-	disk?=nvme
 	PFLASH0=$(firstword \
 		$(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd) \
 		$(wildcard /usr/share/edk2/riscv/RISCV_VIRT_CODE.fd) \
@@ -265,7 +265,7 @@ else ifeq ($(gpu),virtio-gl)
 endif
 
 EXTRA_DISK=$(BUILD)/extra.img
-disk?=ata
+disk?=nvme
 ifeq ($(disk),ata)
 	# For i386, ata will use ided
 	# For aarch64 and x86_64, ata will use ahcid