From 2087dff7e6f0cd03f1559dab7f4e7c0c0ee69372 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 7 Sep 2022 19:37:43 -0600 Subject: [PATCH] Support setting QEMU CPU and machine, use pc as default for i686 --- mk/qemu.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/qemu.mk b/mk/qemu.mk index c6307d5..99b9b99 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -4,13 +4,13 @@ QEMUFLAGS=-d cpu_reset,guest_errors ifeq ($(ARCH),i686) efi=no QEMU_ARCH=i386 - QEMU_MACHINE=q35 - QEMU_CPU=pentium2 + QEMU_MACHINE?=pc + QEMU_CPU?=pentium2 QEMUFLAGS+=-smp 4 -m 2048 else ifeq ($(ARCH),x86_64) QEMU_ARCH=x86_64 - QEMU_MACHINE=q35 - QEMU_CPU=core2duo + QEMU_MACHINE?=q35 + QEMU_CPU?=core2duo QEMU_EFI=/usr/share/OVMF/OVMF_CODE.fd QEMUFLAGS+=-smp 4 -m 2048 else ifeq ($(ARCH),aarch64)