head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2025.12.12.09.42.00;	author adam;	state dead;
branches;
next	1.1;
commitid	3GEHrZKpF3uDo6mG;

1.1
date	2025.12.06.20.10.38;	author leot;	state Exp;
branches;
next	;
commitid	Hy6L4lZlD9UZ3olG;


desc
@@


1.2
log
@qemu: updated to 10.1.3

10.1.3
There are 96 changes since the previous v10.1.2 release, including
the fix for CVE-2025-11234 (use after free in websocket handshake code).
@
text
@$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);
     }
@


1.1
log
@qemu: Backport commit 98107c5d4c1c0a16f1a02a5efbfe01b567215cc6

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

This will be included in QEMU 10.1.3.
@
text
@d1 1
a1 1
$NetBSD$
@