CVS commit: pkgsrc/emulators/qemu

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Dec  6 20:10:39 UTC 2025

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
Added Files:
        pkgsrc/emulators/qemu/patches: patch-pr59820

Log Message:
qemu: Backport commit 98107c5d4c1c0a16f1a02a5efbfe01b567215cc6

Backport commit 98107c5d4c1c0a16f1a02a5efbfe01b567215cc6 in order to fix
PR pkg/59820.

This will be included in QEMU 10.1.3.


To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.241 -r1.242 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/qemu/patches/patch-pr59820

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.389 pkgsrc/emulators/qemu/Makefile:1.390
--- pkgsrc/emulators/qemu/Makefile:1.389        Thu Oct 23 20:36:51 2025
+++ pkgsrc/emulators/qemu/Makefile      Sat Dec  6 20:10:38 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.389 2025/10/23 20:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.390 2025/12/06 20:10:38 leot Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../emulators/qemu/version.mk"
 
 DISTNAME=      qemu-${QEMU_VERSION}

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.241 pkgsrc/emulators/qemu/distinfo:1.242
--- pkgsrc/emulators/qemu/distinfo:1.241        Wed Oct 22 06:35:00 2025
+++ pkgsrc/emulators/qemu/distinfo      Sat Dec  6 20:10:38 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.241 2025/10/22 06:35:00 adam Exp $
+$NetBSD: distinfo,v 1.242 2025/12/06 20:10:38 leot Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -23,6 +23,7 @@ SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = f148a3ad6d72eb29f85684316af5fb219ddaeb71
 SHA1 (patch-meson.build) = 8a76d92303efa054b37d46b27d76d0fb75c15133
+SHA1 (patch-pr59820) = 9cad0580c92ac5dc73ae8a5b46dd1f8423167dff
 SHA1 (patch-qemu-options.hx) = 6cf811ae421db1e8d45f7098bd36733c6dc7d9cf
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = 11663f670c6ca1b9e523b0d16843d87a6061b9a2

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-pr59820
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-pr59820:1.1
--- /dev/null   Sat Dec  6 20:10:39 2025
+++ pkgsrc/emulators/qemu/patches/patch-pr59820 Sat Dec  6 20:10:38 2025
@@ -0,0 +1,52 @@
+$NetBSD: patch-pr59820,v 1.1 2025/12/06 20:10:38 leot Exp $
+
+Backport commit 98107c5d4c1c0a16f1a02a5efbfe01b567215cc6 to fix
+PR pkg/59820:
+
+target/i386: clear CPU_INTERRUPT_SIPI for all accelerators
+
+Similar to what commit df32e5c5 did for TCG; fixes boot with multiple
+processors on WHPX and probably more accelerators
+
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3178
+
+--- target/i386/hvf/x86hvf.c.orig
++++ target/i386/hvf/x86hvf.c
+@@ -447,6 +447,7 @@ int hvf_process_events(CPUState *cs)
+         cs->halted = 0;
+     }
+     if (cs->interrupt_request & CPU_INTERRUPT_SIPI) {
++        cpu_reset_interrupt(cs, CPU_INTERRUPT_SIPI);
+         cpu_synchronize_state(cs);
+         do_cpu_sipi(cpu);
+     }
+--- target/i386/kvm/kvm.c.orig
++++ target/i386/kvm/kvm.c
+@@ -5656,6 +5656,7 @@ int kvm_arch_process_async_events(CPUState *cs)
+         cs->halted = 0;
+     }
+     if (cs->interrupt_request & CPU_INTERRUPT_SIPI) {
++        cpu_reset_interrupt(cs, CPU_INTERRUPT_SIPI);
+         kvm_cpu_synchronize_state(cs);
+         do_cpu_sipi(cpu);
+     }
+--- target/i386/nvmm/nvmm-all.c.orig
++++ target/i386/nvmm/nvmm-all.c
+@@ -706,6 +706,7 @@ nvmm_vcpu_loop(CPUState *cpu)
+         cpu->halted = false;
+     }
+     if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) {
++        cpu_reset_interrupt(cpu, CPU_INTERRUPT_SIPI);
+         nvmm_cpu_synchronize_state(cpu);
+         do_cpu_sipi(x86_cpu);
+     }
+--- target/i386/whpx/whpx-all.c.orig
++++ target/i386/whpx/whpx-all.c
+@@ -1618,6 +1618,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)
+     }
+ 
+     if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) {
++        cpu_reset_interrupt(cpu, CPU_INTERRUPT_SIPI);
+         whpx_cpu_synchronize_state(cpu);
+         do_cpu_sipi(x86_cpu);
+     }