CVS commit: pkgsrc/emulators/qemu

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Apr 25 11:24:29 UTC 2025

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo version.mk
        pkgsrc/emulators/qemu/files: hw-mips-mipssim_virtio.c
        pkgsrc/emulators/qemu/patches: patch-hw-mips-mipssim.c
            patch-target_arm_tcg_translate-sve.c patch-target_i386_cpu.c

Log Message:
qemu: updated to 10.0.0

10.0.0
https://wiki.qemu.org/ChangeLog/10.0


To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.232 -r1.233 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/qemu/version.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.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.378 pkgsrc/emulators/qemu/Makefile:1.379
--- pkgsrc/emulators/qemu/Makefile:1.378        Thu Apr 24 14:13:50 2025
+++ pkgsrc/emulators/qemu/Makefile      Fri Apr 25 11:24:28 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.378 2025/04/24 14:13:50 wiz Exp $
+# $NetBSD: Makefile,v 1.379 2025/04/25 11:24:28 adam Exp $
 
-PKGREVISION= 3
 .include "../../emulators/qemu/version.mk"
 
 DISTNAME=      qemu-${QEMU_VERSION}

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.96 pkgsrc/emulators/qemu/PLIST:1.97
--- pkgsrc/emulators/qemu/PLIST:1.96    Sat Mar 15 20:20:33 2025
+++ pkgsrc/emulators/qemu/PLIST Fri Apr 25 11:24:28 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.96 2025/03/15 20:20:33 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.97 2025/04/25 11:24:28 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -100,9 +100,11 @@ ${PLIST.doc}share/doc/qemu/dbus-dbusinde
 ${PLIST.doc}share/doc/qemu/devel/atomics.html
 ${PLIST.doc}share/doc/qemu/devel/bitops.html
 ${PLIST.doc}share/doc/qemu/devel/block-coroutine-wrapper.html
+${PLIST.doc}share/doc/qemu/devel/build-environment.html
 ${PLIST.doc}share/doc/qemu/devel/build-system.html
 ${PLIST.doc}share/doc/qemu/devel/clocks.html
 ${PLIST.doc}share/doc/qemu/devel/code-of-conduct.html
+${PLIST.doc}share/doc/qemu/devel/codebase.html
 ${PLIST.doc}share/doc/qemu/devel/conflict-resolution.html
 ${PLIST.doc}share/doc/qemu/devel/control-flow-integrity.html
 ${PLIST.doc}share/doc/qemu/devel/crypto.html
@@ -141,12 +143,14 @@ ${PLIST.doc}share/doc/qemu/devel/multi-t
 ${PLIST.doc}share/doc/qemu/devel/multiple-iothreads.html
 ${PLIST.doc}share/doc/qemu/devel/pci.html
 ${PLIST.doc}share/doc/qemu/devel/qapi-code-gen.html
+${PLIST.doc}share/doc/qemu/devel/qapi-domain.html
 ${PLIST.doc}share/doc/qemu/devel/qdev-api.html
 ${PLIST.doc}share/doc/qemu/devel/qom-api.html
 ${PLIST.doc}share/doc/qemu/devel/qom.html
 ${PLIST.doc}share/doc/qemu/devel/rcu.html
 ${PLIST.doc}share/doc/qemu/devel/replay.html
 ${PLIST.doc}share/doc/qemu/devel/reset.html
+${PLIST.doc}share/doc/qemu/devel/rust.html
 ${PLIST.doc}share/doc/qemu/devel/s390-cpu-topology.html
 ${PLIST.doc}share/doc/qemu/devel/s390-dasd-ipl.html
 ${PLIST.doc}share/doc/qemu/devel/secure-coding-practices.html
@@ -171,12 +175,14 @@ ${PLIST.doc}share/doc/qemu/devel/testing
 ${PLIST.doc}share/doc/qemu/devel/testing/qtest.html
 ${PLIST.doc}share/doc/qemu/devel/tracing.html
 ${PLIST.doc}share/doc/qemu/devel/trivial-patches.html
+${PLIST.doc}share/doc/qemu/devel/uefi-vars.html
 ${PLIST.doc}share/doc/qemu/devel/ui.html
 ${PLIST.doc}share/doc/qemu/devel/vfio-iommufd.html
 ${PLIST.doc}share/doc/qemu/devel/virtio-backends.html
 ${PLIST.doc}share/doc/qemu/devel/writing-monitor-commands.html
 ${PLIST.doc}share/doc/qemu/devel/zoned-storage.html
 ${PLIST.doc}share/doc/qemu/genindex.html
+${PLIST.doc}share/doc/qemu/glossary.html
 ${PLIST.doc}share/doc/qemu/index.html
 ${PLIST.doc}share/doc/qemu/interop/barrier.html
 ${PLIST.doc}share/doc/qemu/interop/bitmaps.html
@@ -200,6 +206,9 @@ ${PLIST.doc}share/doc/qemu/interop/vhost
 ${PLIST.doc}share/doc/qemu/interop/virtio-balloon-stats.html
 ${PLIST.doc}share/doc/qemu/interop/vnc-ledstate-pseudo-encoding.html
 ${PLIST.doc}share/doc/qemu/objects.inv
+${PLIST.doc}share/doc/qemu/qapi-qga-index.html
+${PLIST.doc}share/doc/qemu/qapi-qmp-index.html
+${PLIST.doc}share/doc/qemu/qapi-qsd-index.html
 ${PLIST.doc}share/doc/qemu/search.html
 ${PLIST.doc}share/doc/qemu/searchindex.js
 ${PLIST.doc}share/doc/qemu/specs/acpi_cpu_hotplug.html
@@ -209,6 +218,7 @@ ${PLIST.doc}share/doc/qemu/specs/acpi_hw
 ${PLIST.doc}share/doc/qemu/specs/acpi_mem_hotplug.html
 ${PLIST.doc}share/doc/qemu/specs/acpi_nvdimm.html
 ${PLIST.doc}share/doc/qemu/specs/acpi_pci_hotplug.html
+${PLIST.doc}share/doc/qemu/specs/aspeed-intc.html
 ${PLIST.doc}share/doc/qemu/specs/edu.html
 ${PLIST.doc}share/doc/qemu/specs/fsi.html
 ${PLIST.doc}share/doc/qemu/specs/fw_cfg.html
@@ -225,6 +235,7 @@ ${PLIST.doc}share/doc/qemu/specs/ppc-spa
 ${PLIST.doc}share/doc/qemu/specs/ppc-xive.html
 ${PLIST.doc}share/doc/qemu/specs/pvpanic.html
 ${PLIST.doc}share/doc/qemu/specs/rapl-msr.html
+${PLIST.doc}share/doc/qemu/specs/riscv-aia.html
 ${PLIST.doc}share/doc/qemu/specs/riscv-iommu.html
 ${PLIST.doc}share/doc/qemu/specs/rocker.html
 ${PLIST.doc}share/doc/qemu/specs/sev-guest-firmware.html
@@ -248,6 +259,7 @@ ${PLIST.doc}share/doc/qemu/system/arm/ex
 ${PLIST.doc}share/doc/qemu/system/arm/fby35.html
 ${PLIST.doc}share/doc/qemu/system/arm/highbank.html
 ${PLIST.doc}share/doc/qemu/system/arm/imx25-pdk.html
+${PLIST.doc}share/doc/qemu/system/arm/imx8mp-evk.html
 ${PLIST.doc}share/doc/qemu/system/arm/integratorcp.html
 ${PLIST.doc}share/doc/qemu/system/arm/kzm.html
 ${PLIST.doc}share/doc/qemu/system/arm/mcimx6ul-evk.html
@@ -268,6 +280,7 @@ ${PLIST.doc}share/doc/qemu/system/arm/sx
 ${PLIST.doc}share/doc/qemu/system/arm/versatile.html
 ${PLIST.doc}share/doc/qemu/system/arm/vexpress.html
 ${PLIST.doc}share/doc/qemu/system/arm/virt.html
+${PLIST.doc}share/doc/qemu/system/arm/vmapple.html
 ${PLIST.doc}share/doc/qemu/system/arm/xenpvh.html
 ${PLIST.doc}share/doc/qemu/system/arm/xlnx-versal-virt.html
 ${PLIST.doc}share/doc/qemu/system/arm/xlnx-zcu102.html
@@ -283,6 +296,7 @@ ${PLIST.doc}share/doc/qemu/system/device
 ${PLIST.doc}share/doc/qemu/system/devices/ccid.html
 ${PLIST.doc}share/doc/qemu/system/devices/cxl.html
 ${PLIST.doc}share/doc/qemu/system/devices/igb.html
+${PLIST.doc}share/doc/qemu/system/devices/ivshmem-flat.html
 ${PLIST.doc}share/doc/qemu/system/devices/ivshmem.html
 ${PLIST.doc}share/doc/qemu/system/devices/keyboard.html
 ${PLIST.doc}share/doc/qemu/system/devices/net.html
@@ -335,6 +349,7 @@ ${PLIST.doc}share/doc/qemu/system/qemu-b
 ${PLIST.doc}share/doc/qemu/system/qemu-cpu-models.html
 ${PLIST.doc}share/doc/qemu/system/qemu-manpage.html
 ${PLIST.doc}share/doc/qemu/system/replay.html
+${PLIST.doc}share/doc/qemu/system/riscv/microblaze-v-generic.html
 ${PLIST.doc}share/doc/qemu/system/riscv/microchip-icicle-kit.html
 ${PLIST.doc}share/doc/qemu/system/riscv/shakti-c.html
 ${PLIST.doc}share/doc/qemu/system/riscv/sifive_u.html
@@ -352,6 +367,7 @@ ${PLIST.doc}share/doc/qemu/system/securi
 ${PLIST.doc}share/doc/qemu/system/target-arm.html
 ${PLIST.doc}share/doc/qemu/system/target-avr.html
 ${PLIST.doc}share/doc/qemu/system/target-i386.html
+${PLIST.doc}share/doc/qemu/system/target-loongarch.html
 ${PLIST.doc}share/doc/qemu/system/target-m68k.html
 ${PLIST.doc}share/doc/qemu/system/target-mips.html
 ${PLIST.doc}share/doc/qemu/system/target-openrisc.html
@@ -473,6 +489,7 @@ share/qemu/linuxboot_dma.bin
 share/qemu/multiboot.bin
 share/qemu/multiboot_dma.bin
 share/qemu/npcm7xx_bootrom.bin
+share/qemu/npcm8xx_bootrom.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
 share/qemu/openbios-sparc64
@@ -481,6 +498,7 @@ share/qemu/opensbi-riscv64-generic-fw_dy
 share/qemu/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
+share/qemu/pnv-pnor.bin
 share/qemu/pvh.bin
 share/qemu/pxe-e1000.rom
 share/qemu/pxe-eepro100.rom

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.232 pkgsrc/emulators/qemu/distinfo:1.233
--- pkgsrc/emulators/qemu/distinfo:1.232        Tue Apr  1 07:27:14 2025
+++ pkgsrc/emulators/qemu/distinfo      Fri Apr 25 11:24:28 2025
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.232 2025/04/01 07:27:14 adam Exp $
+$NetBSD: distinfo,v 1.233 2025/04/25 11:24:28 adam Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
 Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
-BLAKE2s (qemu-9.2.3.tar.xz) = e64968e15deadcda068ab9e569a2261c52e42f7816c657493a0b1cda57f80c91
-SHA512 (qemu-9.2.3.tar.xz) = 941a4337a115c65de2fca042932efb31886114f4300226fcf55f04c2c5471bd2b5ce220c4b17e01c3679bd55ba08a1aa7ce399de15e3e5f28c17da52030b139e
-Size (qemu-9.2.3.tar.xz) = 134755248 bytes
+BLAKE2s (qemu-10.0.0.tar.xz) = ab3a3b3fb4db99d8711eac8d5b3948fd2b8feca78b5dabb2ada6b70aeb322e97
+SHA512 (qemu-10.0.0.tar.xz) = 2215458ed8be3ab0b0032fe2a96e79183f5fc2da323d927018412ea3d980b022a07ba87d4f446229eaaa7d1b19a577d438dbcaa3af3bd537c7720b56734a2d8b
+Size (qemu-10.0.0.tar.xz) = 135618260 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
 SHA1 (patch-fsdev_file-op-9p.h) = d951ea05ec31977e720f6ee02f53f1cd3d7c356e
 SHA1 (patch-fsdev_meson.build) = 918a361056b9808caecf4fbd85f44cfc405a1606
 SHA1 (patch-hw-mips-Kconfig) = c74efac1b5d3a49d141387eb9316617039be737b
-SHA1 (patch-hw-mips-mipssim.c) = c72129c6ad961a62d3f1b443bbf373ee3c900dc0
+SHA1 (patch-hw-mips-mipssim.c) = dcb363d2c27f963394b8ae00a64b33c263d30900
 SHA1 (patch-hw_9pfs_9p-synth.c) = f6af717a11d1cc7851f6dd388c7030264e1ee772
 SHA1 (patch-hw_9pfs_9p-util.h) = c286ea007f0ca3250442afe45c22dbeac640a077
 SHA1 (patch-hw_9pfs_9p.c) = 05c418eebf501dfbfff686d66d32953a1a41f9ca
@@ -25,8 +25,8 @@ SHA1 (patch-hw_usb_dev-mtp.c) = f148a3ad
 SHA1 (patch-meson.build) = 8a76d92303efa054b37d46b27d76d0fb75c15133
 SHA1 (patch-qemu-options.hx) = 6cf811ae421db1e8d45f7098bd36733c6dc7d9cf
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
-SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
-SHA1 (patch-target_i386_cpu.c) = f55795305c385784caee00c2a767a1cafa42ed91
+SHA1 (patch-target_arm_tcg_translate-sve.c) = f5e5ef33107d696cdc9ef99dee4a9ca0b5d23ea6
+SHA1 (patch-target_i386_cpu.c) = 73571b7602ab9387d6cb8603c1790b7948e767d4
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
 SHA1 (patch-target_i386_nvmm_nvmm-all.c) = a25d957fd9ff7c35b8370604bff379c494220bd3
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a

Index: pkgsrc/emulators/qemu/version.mk
diff -u pkgsrc/emulators/qemu/version.mk:1.3 pkgsrc/emulators/qemu/version.mk:1.4
--- pkgsrc/emulators/qemu/version.mk:1.3        Tue Apr  1 07:27:14 2025
+++ pkgsrc/emulators/qemu/version.mk    Fri Apr 25 11:24:28 2025
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.3 2025/04/01 07:27:14 adam Exp $
+# $NetBSD: version.mk,v 1.4 2025/04/25 11:24:28 adam Exp $
 #
 # used by emulators/qemu
 # used by sysutils/qemu-guest-agent
 
-QEMU_VERSION?= 9.2.3
+QEMU_VERSION?= 10.0.0

Index: pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
diff -u pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.4 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.5
--- pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.4    Wed Apr 24 07:20:59 2024
+++ pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c        Fri Apr 25 11:24:28 2025
@@ -38,7 +38,7 @@
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 #include "net/net.h"
-#include "sysemu/sysemu.h"
+#include "system/system.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/or-irq.h"
@@ -47,8 +47,8 @@
 #include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
-#include "sysemu/qtest.h"
-#include "sysemu/reset.h"
+#include "system/qtest.h"
+#include "system/reset.h"
 #include "hw/virtio/virtio-mmio.h"
 
 #define NUM_VIRTIO_TRANSPORTS   32

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.6 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.7
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.6   Sun Mar  2 12:44:19 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c       Fri Apr 25 11:24:29 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-hw-mips-mipssim.c,v 1.6 2025/03/02 12:44:19 nia Exp $
+$NetBSD: patch-hw-mips-mipssim.c,v 1.7 2025/04/25 11:24:29 adam Exp $
 
 Adding support for VirtIO extensions to the MIPSSIM machine,
 which NetBSD has special extensions to support.
 
---- hw/mips/mipssim.c.orig     2024-04-10 17:43:25.000000000 +0000
+--- hw/mips/mipssim.c.orig     2025-04-22 20:26:11.000000000 +0000
 +++ hw/mips/mipssim.c
 @@ -36,6 +36,7 @@
- #include "sysemu/sysemu.h"
+ #include "system/system.h"
  #include "hw/boards.h"
  #include "hw/loader.h"
 +#include "hw/or-irq.h"
  #include "elf.h"
  #include "hw/sysbus.h"
  #include "hw/qdev-properties.h"
-@@ -136,7 +137,7 @@ static void mipsnet_init(int base, qemu_
+@@ -137,7 +138,7 @@ static void mipsnet_init(int base, qemu_
                                  sysbus_mmio_get_region(s, 0));
  }
  
@@ -22,7 +22,7 @@ which NetBSD has special extensions to s
  mips_mipssim_init(MachineState *machine)
  {
      const char *kernel_filename = machine->kernel_filename;
-@@ -147,6 +148,7 @@ mips_mipssim_init(MachineState *machine)
+@@ -148,6 +149,7 @@ mips_mipssim_init(MachineState *machine)
      MemoryRegion *isa = g_new(MemoryRegion, 1);
      MemoryRegion *bios = g_new(MemoryRegion, 1);
      Clock *cpuclk;
@@ -30,7 +30,7 @@ which NetBSD has special extensions to s
      MIPSCPU *cpu;
      CPUMIPSState *env;
      ResetData *reset_info;
-@@ -233,6 +235,23 @@ mips_mipssim_init(MachineState *machine)
+@@ -235,6 +237,23 @@ mips_mipssim_init(MachineState *machine)
  
      /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
      mipsnet_init(0x4200, env->irq[2]);

Index: pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c:1.1 pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c:1.1      Wed Jun  7 07:19:22 2023
+++ pkgsrc/emulators/qemu/patches/patch-target_arm_tcg_translate-sve.c  Fri Apr 25 11:24:29 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-target_arm_tcg_translate-sve.c,v 1.1 2023/06/07 07:19:22 adam Exp $
+$NetBSD: patch-target_arm_tcg_translate-sve.c,v 1.2 2025/04/25 11:24:29 adam Exp $
 
 Avoid FSCALE define, notably on SunOS.
 
---- target/arm/tcg/translate-sve.c.orig        2022-08-30 16:41:57.000000000 +0000
+--- target/arm/tcg/translate-sve.c.orig        2025-04-22 20:26:11.000000000 +0000
 +++ target/arm/tcg/translate-sve.c
-@@ -3988,6 +3988,9 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve
-     };                                                          \
-     TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz, name##_zpzz_fns[a->esz], a)
+@@ -3803,6 +3803,9 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve
+                s->fpcr_ah ? name##_ah_zpzz_fns[a->esz] :                \
+                name##_zpzz_fns[a->esz], a)
  
 +#ifdef FSCALE
 +#undef FSCALE

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.4 pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.5
--- pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.4   Wed Apr 24 07:20:59 2024
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c       Fri Apr 25 11:24:29 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-target_i386_cpu.c,v 1.4 2024/04/24 07:20:59 adam Exp $
+$NetBSD: patch-target_i386_cpu.c,v 1.5 2025/04/25 11:24:29 adam Exp $
 
 Permit to use `-cpu host' with NVMM.
 
---- target/i386/cpu.c.orig     2024-04-10 17:43:26.000000000 +0000
+--- target/i386/cpu.c.orig     2025-04-22 20:26:11.000000000 +0000
 +++ target/i386/cpu.c
-@@ -25,6 +25,7 @@
- #include "cpu.h"
+@@ -26,6 +26,7 @@
  #include "tcg/helper-tcg.h"
- #include "sysemu/hvf.h"
-+#include "sysemu/nvmm.h"
+ #include "exec/translation-block.h"
+ #include "system/hvf.h"
++#include "system/nvmm.h"
  #include "hvf/hvf-i386.h"
  #include "kvm/kvm_i386.h"
  #include "sev.h"
-@@ -1644,7 +1645,7 @@ uint32_t xsave_area_size(uint64_t mask,
+@@ -1899,7 +1900,7 @@ uint32_t xsave_area_size(uint64_t mask,
  
  static inline bool accel_uses_host_cpuid(void)
  {
@@ -21,7 +21,7 @@ Permit to use `-cpu host' with NVMM.
  }
  
  static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
-@@ -7325,7 +7326,8 @@ static void x86_cpu_realizefn(DeviceStat
+@@ -8190,7 +8191,8 @@ static void x86_cpu_realizefn(DeviceStat
  
      if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
          g_autofree char *name = x86_cpu_class_get_model_name(xcc);