CVS commit: pkgsrc/emulators/qemu

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri May 16 02:11:10 UTC 2025

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
Added Files:
        pkgsrc/emulators/qemu/patches: patch-target_i386_hvf_x86__cpuid.c

Log Message:
qemu: fix booting HVF x86 guests with 2 or more CPUs.


To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.233 -r1.234 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_hvf_x86__cpuid.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.379 pkgsrc/emulators/qemu/Makefile:1.380
--- pkgsrc/emulators/qemu/Makefile:1.379        Fri Apr 25 11:24:28 2025
+++ pkgsrc/emulators/qemu/Makefile      Fri May 16 02:11:10 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.379 2025/04/25 11:24:28 adam Exp $
+# $NetBSD: Makefile,v 1.380 2025/05/16 02:11:10 schmonz Exp $
 
 .include "../../emulators/qemu/version.mk"
 
 DISTNAME=      qemu-${QEMU_VERSION}
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.233 pkgsrc/emulators/qemu/distinfo:1.234
--- pkgsrc/emulators/qemu/distinfo:1.233        Fri Apr 25 11:24:28 2025
+++ pkgsrc/emulators/qemu/distinfo      Fri May 16 02:11:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.233 2025/04/25 11:24:28 adam Exp $
+$NetBSD: distinfo,v 1.234 2025/05/16 02:11:10 schmonz Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -27,6 +27,7 @@ SHA1 (patch-qemu-options.hx) = 6cf811ae4
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = f5e5ef33107d696cdc9ef99dee4a9ca0b5d23ea6
 SHA1 (patch-target_i386_cpu.c) = 73571b7602ab9387d6cb8603c1790b7948e767d4
+SHA1 (patch-target_i386_hvf_x86__cpuid.c) = 94d4f87a9eea8c115148cf487e99a66d5b1fe86f
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
 SHA1 (patch-target_i386_nvmm_nvmm-all.c) = a25d957fd9ff7c35b8370604bff379c494220bd3
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_hvf_x86__cpuid.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-target_i386_hvf_x86__cpuid.c:1.1
--- /dev/null   Fri May 16 02:11:10 2025
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_hvf_x86__cpuid.c    Fri May 16 02:11:10 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-target_i386_hvf_x86__cpuid.c,v 1.1 2025/05/16 02:11:10 schmonz Exp $
+
+Fix booting HVF x86 guests with 2 or more CPUs.
+
+Bug report: <https://gitlab.com/qemu-project/qemu/-/issues/2938>
+
+Patch: <https://lore.kernel.org/qemu-devel/20250514031652.838763-3-xiaoyao.li%intel.com@localhost/>
+
+--- target/i386/hvf/x86_cpuid.c.orig   2025-05-16 01:40:12.741037957 +0000
++++ target/i386/hvf/x86_cpuid.c
+@@ -73,7 +73,7 @@ uint32_t hvf_get_supported_cpuid(uint32_
+              CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC |
+              CPUID_SEP | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV |
+              CPUID_PAT | CPUID_PSE36 | CPUID_CLFLUSH | CPUID_MMX |
+-             CPUID_FXSR | CPUID_SSE | CPUID_SSE2 | CPUID_SS;
++             CPUID_FXSR | CPUID_SSE | CPUID_SSE2 | CPUID_SS | CPUID_HT;
+         ecx &= CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSSE3 |
+              CPUID_EXT_FMA | CPUID_EXT_CX16 | CPUID_EXT_PCID |
+              CPUID_EXT_SSE41 | CPUID_EXT_SSE42 | CPUID_EXT_MOVBE |