Wed Apr 24 07:20:59 2024 UTC (33d)
qemu: updated to 9.0.0

9.0.0
https://wiki.qemu.org/ChangeLog/9.0


(adam)
diff -r1.340 -r1.341 pkgsrc/emulators/qemu/Makefile
diff -r1.88 -r1.89 pkgsrc/emulators/qemu/PLIST
diff -r1.216 -r1.217 pkgsrc/emulators/qemu/distinfo
diff -r1.3 -r1.4 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c
diff -r1.4 -r1.5 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
diff -r1.14 -r1.15 pkgsrc/emulators/qemu/patches/patch-meson.build
cvs diff -r1.340 -r1.341 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2024/04/07 07:33:58 1.340
+++ pkgsrc/emulators/qemu/Makefile 2024/04/24 07:20:59 1.341
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.340 2024/04/07 07:33:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.341 2024/04/24 07:20:59 adam Exp $
2 2
3DISTNAME= qemu-8.2.2 3DISTNAME= qemu-9.0.0
4PKGREVISION= 2 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 5MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.qemu.org/ 9HOMEPAGE= https://www.qemu.org/
11COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 12
14TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson 13TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
15TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
16TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 15TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
17TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme 16TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
18 17
19USE_CURSES= resize_term wide 18USE_CURSES= resize_term wide
20USE_LANGUAGES+= c c++ 19USE_LANGUAGES+= c c++
21USE_TOOLS+= bison flex makeinfo perl:build pod2man pkg-config 20USE_TOOLS+= bison flex makeinfo perl:build pod2man pkg-config
22UNLIMIT_RESOURCES= datasize 21UNLIMIT_RESOURCES= datasize
23HAS_CONFIGURE= yes 22HAS_CONFIGURE= yes
24 23
25# https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab 24# https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
26GCC_REQD+= 7 25GCC_REQD+= 7
27 26
28PYTHON_VERSIONS_INCOMPATIBLE= 27 27PYTHON_VERSIONS_INCOMPATIBLE= 27
29 28
30.include "options.mk" 29.include "options.mk"
31 30
32.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
33 32
34# When upgrading Qemu, you need to determine if this PALcode binary for 33# When upgrading Qemu, you need to determine if this PALcode binary for
35# the Alpha emulator needs to be re-built. If it does not, then you do 34# the Alpha emulator needs to be re-built. If it does not, then you do
36# not need to bump the version of this PALcode binary blob (which is 35# not need to bump the version of this PALcode binary blob (which is
37# supplied as a separate distfile). Contact thorpej@ for details. 36# supplied as a separate distfile). Contact thorpej@ for details.
38PALCODE_CLIPPER= palcode-clipper-qemu-5.2.0nb8 37PALCODE_CLIPPER= palcode-clipper-qemu-5.2.0nb8
39 38
@@ -202,23 +201,24 @@ post-install: @@ -202,23 +201,24 @@ post-install:
202 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC 201 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
203 202
204.include "../../archivers/lzo/buildlink3.mk" 203.include "../../archivers/lzo/buildlink3.mk"
205.include "../../archivers/zstd/buildlink3.mk" 204.include "../../archivers/zstd/buildlink3.mk"
206.include "../../devel/glib2/buildlink3.mk" 205.include "../../devel/glib2/buildlink3.mk"
207.include "../../devel/libusb1/buildlink3.mk" 206.include "../../devel/libusb1/buildlink3.mk"
208.include "../../devel/snappy/buildlink3.mk" 207.include "../../devel/snappy/buildlink3.mk"
209.include "../../devel/zlib/buildlink3.mk" 208.include "../../devel/zlib/buildlink3.mk"
210.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 209.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
211.include "../../graphics/png/buildlink3.mk" 210.include "../../graphics/png/buildlink3.mk"
212.include "../../lang/python/tool.mk" 211.include "../../lang/python/tool.mk"
213.include "../../net/libslirp/buildlink3.mk" 212.include "../../net/libslirp/buildlink3.mk"
214.include "../../security/libgcrypt/buildlink3.mk" 213.include "../../security/libgcrypt/buildlink3.mk"
 214.include "../../security/libtasn1/buildlink3.mk"
215.include "../../sysutils/dtc/buildlink3.mk" 215.include "../../sysutils/dtc/buildlink3.mk"
216.include "../../www/curl/buildlink3.mk" 216.include "../../www/curl/buildlink3.mk"
217.include "../../x11/pixman/buildlink3.mk" 217.include "../../x11/pixman/buildlink3.mk"
218.if ${OPSYS} != "Darwin" 218.if ${OPSYS} != "Darwin"
219.include "../../x11/xkeyboard-config/buildlink3.mk" 219.include "../../x11/xkeyboard-config/buildlink3.mk"
220.endif 220.endif
221.include "../../mk/curses.buildlink3.mk" 221.include "../../mk/curses.buildlink3.mk"
222.include "../../mk/jpeg.buildlink3.mk" 222.include "../../mk/jpeg.buildlink3.mk"
223.include "../../mk/pthread.buildlink3.mk" 223.include "../../mk/pthread.buildlink3.mk"
224.include "../../mk/bsd.pkg.mk" 224.include "../../mk/bsd.pkg.mk"
cvs diff -r1.88 -r1.89 pkgsrc/emulators/qemu/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/PLIST 2023/12/28 17:15:39 1.88
+++ pkgsrc/emulators/qemu/PLIST 2024/04/24 07:20:59 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.88 2023/12/28 17:15:39 adam Exp $ 1@comment $NetBSD: PLIST,v 1.89 2024/04/24 07:20:59 adam Exp $
2bin/elf2dmp 2bin/elf2dmp
3${PLIST.aarch64}bin/qemu-aarch64 3${PLIST.aarch64}bin/qemu-aarch64
4${PLIST.aarch64_be}bin/qemu-aarch64_be 4${PLIST.aarch64_be}bin/qemu-aarch64_be
5${PLIST.alpha}bin/qemu-alpha 5${PLIST.alpha}bin/qemu-alpha
6${PLIST.arm}bin/qemu-arm 6${PLIST.arm}bin/qemu-arm
7${PLIST.armeb}bin/qemu-armeb 7${PLIST.armeb}bin/qemu-armeb
8${PLIST.cris}bin/qemu-cris 8${PLIST.cris}bin/qemu-cris
9bin/qemu-edid 9bin/qemu-edid
10${PLIST.ga}bin/qemu-ga 10${PLIST.ga}bin/qemu-ga
11${PLIST.hexagon}bin/qemu-hexagon 11${PLIST.hexagon}bin/qemu-hexagon
12${PLIST.hppa}bin/qemu-hppa 12${PLIST.hppa}bin/qemu-hppa
13${PLIST.i386}bin/qemu-i386 13${PLIST.i386}bin/qemu-i386
14bin/qemu-img 14bin/qemu-img
@@ -101,39 +101,50 @@ share/doc/qemu/about/license.html @@ -101,39 +101,50 @@ share/doc/qemu/about/license.html
101share/doc/qemu/about/removed-features.html 101share/doc/qemu/about/removed-features.html
102share/doc/qemu/dbus-dbusindex.html 102share/doc/qemu/dbus-dbusindex.html
103share/doc/qemu/devel/acpi-bits.html 103share/doc/qemu/devel/acpi-bits.html
104share/doc/qemu/devel/atomics.html 104share/doc/qemu/devel/atomics.html
105share/doc/qemu/devel/bitops.html 105share/doc/qemu/devel/bitops.html
106share/doc/qemu/devel/block-coroutine-wrapper.html 106share/doc/qemu/devel/block-coroutine-wrapper.html
107share/doc/qemu/devel/build-system.html 107share/doc/qemu/devel/build-system.html
108share/doc/qemu/devel/ci.html 108share/doc/qemu/devel/ci.html
109share/doc/qemu/devel/clocks.html 109share/doc/qemu/devel/clocks.html
110share/doc/qemu/devel/code-of-conduct.html 110share/doc/qemu/devel/code-of-conduct.html
111share/doc/qemu/devel/conflict-resolution.html 111share/doc/qemu/devel/conflict-resolution.html
112share/doc/qemu/devel/control-flow-integrity.html 112share/doc/qemu/devel/control-flow-integrity.html
113share/doc/qemu/devel/decodetree.html 113share/doc/qemu/devel/decodetree.html
 114share/doc/qemu/devel/docs.html
114share/doc/qemu/devel/ebpf_rss.html 115share/doc/qemu/devel/ebpf_rss.html
115share/doc/qemu/devel/fuzzing.html 116share/doc/qemu/devel/fuzzing.html
116share/doc/qemu/devel/index-api.html 117share/doc/qemu/devel/index-api.html
117share/doc/qemu/devel/index-build.html 118share/doc/qemu/devel/index-build.html
118share/doc/qemu/devel/index-internals.html 119share/doc/qemu/devel/index-internals.html
119share/doc/qemu/devel/index-process.html 120share/doc/qemu/devel/index-process.html
120share/doc/qemu/devel/index-tcg.html 121share/doc/qemu/devel/index-tcg.html
121share/doc/qemu/devel/index.html 122share/doc/qemu/devel/index.html
122share/doc/qemu/devel/kconfig.html 123share/doc/qemu/devel/kconfig.html
123share/doc/qemu/devel/loads-stores.html 124share/doc/qemu/devel/loads-stores.html
124share/doc/qemu/devel/maintainers.html 125share/doc/qemu/devel/maintainers.html
125share/doc/qemu/devel/memory.html 126share/doc/qemu/devel/memory.html
126share/doc/qemu/devel/migration.html 127share/doc/qemu/devel/migration/CPR.html
 128share/doc/qemu/devel/migration/best-practices.html
 129share/doc/qemu/devel/migration/compatibility.html
 130share/doc/qemu/devel/migration/dirty-limit.html
 131share/doc/qemu/devel/migration/features.html
 132share/doc/qemu/devel/migration/index.html
 133share/doc/qemu/devel/migration/main.html
 134share/doc/qemu/devel/migration/mapped-ram.html
 135share/doc/qemu/devel/migration/postcopy.html
 136share/doc/qemu/devel/migration/vfio.html
 137share/doc/qemu/devel/migration/virtio.html
127share/doc/qemu/devel/modules.html 138share/doc/qemu/devel/modules.html
128share/doc/qemu/devel/multi-process.html 139share/doc/qemu/devel/multi-process.html
129share/doc/qemu/devel/multi-thread-tcg.html 140share/doc/qemu/devel/multi-thread-tcg.html
130share/doc/qemu/devel/pci.html 141share/doc/qemu/devel/pci.html
131share/doc/qemu/devel/qapi-code-gen.html 142share/doc/qemu/devel/qapi-code-gen.html
132share/doc/qemu/devel/qdev-api.html 143share/doc/qemu/devel/qdev-api.html
133share/doc/qemu/devel/qgraph.html 144share/doc/qemu/devel/qgraph.html
134share/doc/qemu/devel/qom-api.html 145share/doc/qemu/devel/qom-api.html
135share/doc/qemu/devel/qom.html 146share/doc/qemu/devel/qom.html
136share/doc/qemu/devel/qtest.html 147share/doc/qemu/devel/qtest.html
137share/doc/qemu/devel/replay.html 148share/doc/qemu/devel/replay.html
138share/doc/qemu/devel/reset.html 149share/doc/qemu/devel/reset.html
139share/doc/qemu/devel/s390-cpu-topology.html 150share/doc/qemu/devel/s390-cpu-topology.html
@@ -141,27 +152,27 @@ share/doc/qemu/devel/s390-dasd-ipl.html @@ -141,27 +152,27 @@ share/doc/qemu/devel/s390-dasd-ipl.html
141share/doc/qemu/devel/secure-coding-practices.html 152share/doc/qemu/devel/secure-coding-practices.html
142share/doc/qemu/devel/stable-process.html 153share/doc/qemu/devel/stable-process.html
143share/doc/qemu/devel/style.html 154share/doc/qemu/devel/style.html
144share/doc/qemu/devel/submitting-a-patch.html 155share/doc/qemu/devel/submitting-a-patch.html
145share/doc/qemu/devel/submitting-a-pull-request.html 156share/doc/qemu/devel/submitting-a-pull-request.html
146share/doc/qemu/devel/tcg-icount.html 157share/doc/qemu/devel/tcg-icount.html
147share/doc/qemu/devel/tcg-ops.html 158share/doc/qemu/devel/tcg-ops.html
148share/doc/qemu/devel/tcg-plugins.html 159share/doc/qemu/devel/tcg-plugins.html
149share/doc/qemu/devel/tcg.html 160share/doc/qemu/devel/tcg.html
150share/doc/qemu/devel/testing.html 161share/doc/qemu/devel/testing.html
151share/doc/qemu/devel/tracing.html 162share/doc/qemu/devel/tracing.html
152share/doc/qemu/devel/trivial-patches.html 163share/doc/qemu/devel/trivial-patches.html
153share/doc/qemu/devel/ui.html 164share/doc/qemu/devel/ui.html
154share/doc/qemu/devel/vfio-migration.html 165share/doc/qemu/devel/vfio-iommufd.html
155share/doc/qemu/devel/virtio-backends.html 166share/doc/qemu/devel/virtio-backends.html
156share/doc/qemu/devel/writing-monitor-commands.html 167share/doc/qemu/devel/writing-monitor-commands.html
157share/doc/qemu/devel/zoned-storage.html 168share/doc/qemu/devel/zoned-storage.html
158share/doc/qemu/genindex.html 169share/doc/qemu/genindex.html
159share/doc/qemu/index.html 170share/doc/qemu/index.html
160share/doc/qemu/interop/barrier.html 171share/doc/qemu/interop/barrier.html
161share/doc/qemu/interop/bitmaps.html 172share/doc/qemu/interop/bitmaps.html
162share/doc/qemu/interop/dbus-display.html 173share/doc/qemu/interop/dbus-display.html
163share/doc/qemu/interop/dbus-vmstate.html 174share/doc/qemu/interop/dbus-vmstate.html
164share/doc/qemu/interop/dbus.html 175share/doc/qemu/interop/dbus.html
165share/doc/qemu/interop/index.html 176share/doc/qemu/interop/index.html
166share/doc/qemu/interop/live-block-operations.html 177share/doc/qemu/interop/live-block-operations.html
167share/doc/qemu/interop/pr-helper.html 178share/doc/qemu/interop/pr-helper.html
@@ -176,47 +187,49 @@ share/doc/qemu/interop/vhost-vdpa.html @@ -176,47 +187,49 @@ share/doc/qemu/interop/vhost-vdpa.html
176share/doc/qemu/interop/virtio-balloon-stats.html 187share/doc/qemu/interop/virtio-balloon-stats.html
177share/doc/qemu/interop/vnc-ledstate-pseudo-encoding.html 188share/doc/qemu/interop/vnc-ledstate-pseudo-encoding.html
178share/doc/qemu/objects.inv 189share/doc/qemu/objects.inv
179share/doc/qemu/search.html 190share/doc/qemu/search.html
180share/doc/qemu/searchindex.js 191share/doc/qemu/searchindex.js
181share/doc/qemu/specs/acpi_cpu_hotplug.html 192share/doc/qemu/specs/acpi_cpu_hotplug.html
182share/doc/qemu/specs/acpi_erst.html 193share/doc/qemu/specs/acpi_erst.html
183share/doc/qemu/specs/acpi_hest_ghes.html 194share/doc/qemu/specs/acpi_hest_ghes.html
184share/doc/qemu/specs/acpi_hw_reduced_hotplug.html 195share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
185share/doc/qemu/specs/acpi_mem_hotplug.html 196share/doc/qemu/specs/acpi_mem_hotplug.html
186share/doc/qemu/specs/acpi_nvdimm.html 197share/doc/qemu/specs/acpi_nvdimm.html
187share/doc/qemu/specs/acpi_pci_hotplug.html 198share/doc/qemu/specs/acpi_pci_hotplug.html
188share/doc/qemu/specs/edu.html 199share/doc/qemu/specs/edu.html
 200share/doc/qemu/specs/fsi.html
189share/doc/qemu/specs/fw_cfg.html 201share/doc/qemu/specs/fw_cfg.html
190share/doc/qemu/specs/index.html 202share/doc/qemu/specs/index.html
191share/doc/qemu/specs/ivshmem-spec.html 203share/doc/qemu/specs/ivshmem-spec.html
192share/doc/qemu/specs/pci-ids.html 204share/doc/qemu/specs/pci-ids.html
193share/doc/qemu/specs/pci-serial.html 205share/doc/qemu/specs/pci-serial.html
194share/doc/qemu/specs/pci-testdev.html 206share/doc/qemu/specs/pci-testdev.html
195share/doc/qemu/specs/ppc-spapr-hcalls.html 207share/doc/qemu/specs/ppc-spapr-hcalls.html
196share/doc/qemu/specs/ppc-spapr-hotplug.html 208share/doc/qemu/specs/ppc-spapr-hotplug.html
197share/doc/qemu/specs/ppc-spapr-numa.html 209share/doc/qemu/specs/ppc-spapr-numa.html
198share/doc/qemu/specs/ppc-spapr-uv-hcalls.html 210share/doc/qemu/specs/ppc-spapr-uv-hcalls.html
199share/doc/qemu/specs/ppc-spapr-xive.html 211share/doc/qemu/specs/ppc-spapr-xive.html
200share/doc/qemu/specs/ppc-xive.html 212share/doc/qemu/specs/ppc-xive.html
201share/doc/qemu/specs/pvpanic.html 213share/doc/qemu/specs/pvpanic.html
202share/doc/qemu/specs/sev-guest-firmware.html 214share/doc/qemu/specs/sev-guest-firmware.html
203share/doc/qemu/specs/standard-vga.html 215share/doc/qemu/specs/standard-vga.html
204share/doc/qemu/specs/tpm.html 216share/doc/qemu/specs/tpm.html
205share/doc/qemu/specs/virt-ctlr.html 217share/doc/qemu/specs/virt-ctlr.html
206share/doc/qemu/specs/vmcoreinfo.html 218share/doc/qemu/specs/vmcoreinfo.html
207share/doc/qemu/specs/vmgenid.html 219share/doc/qemu/specs/vmgenid.html
208share/doc/qemu/specs/vmw_pvscsi-spec.html 220share/doc/qemu/specs/vmw_pvscsi-spec.html
209share/doc/qemu/system/arm/aspeed.html 221share/doc/qemu/system/arm/aspeed.html
 222share/doc/qemu/system/arm/b-l475e-iot01a.html
210share/doc/qemu/system/arm/bananapi_m2u.html 223share/doc/qemu/system/arm/bananapi_m2u.html
211share/doc/qemu/system/arm/collie.html 224share/doc/qemu/system/arm/collie.html
212share/doc/qemu/system/arm/cpu-features.html 225share/doc/qemu/system/arm/cpu-features.html
213share/doc/qemu/system/arm/cubieboard.html 226share/doc/qemu/system/arm/cubieboard.html
214share/doc/qemu/system/arm/digic.html 227share/doc/qemu/system/arm/digic.html
215share/doc/qemu/system/arm/emcraft-sf2.html 228share/doc/qemu/system/arm/emcraft-sf2.html
216share/doc/qemu/system/arm/emulation.html 229share/doc/qemu/system/arm/emulation.html
217share/doc/qemu/system/arm/gumstix.html 230share/doc/qemu/system/arm/gumstix.html
218share/doc/qemu/system/arm/highbank.html 231share/doc/qemu/system/arm/highbank.html
219share/doc/qemu/system/arm/imx25-pdk.html 232share/doc/qemu/system/arm/imx25-pdk.html
220share/doc/qemu/system/arm/integratorcp.html 233share/doc/qemu/system/arm/integratorcp.html
221share/doc/qemu/system/arm/kzm.html 234share/doc/qemu/system/arm/kzm.html
222share/doc/qemu/system/arm/mainstone.html 235share/doc/qemu/system/arm/mainstone.html
@@ -248,26 +261,27 @@ share/doc/qemu/system/confidential-guest @@ -248,26 +261,27 @@ share/doc/qemu/system/confidential-guest
248share/doc/qemu/system/cpu-hotplug.html 261share/doc/qemu/system/cpu-hotplug.html
249share/doc/qemu/system/device-emulation.html 262share/doc/qemu/system/device-emulation.html
250share/doc/qemu/system/devices/can.html 263share/doc/qemu/system/devices/can.html
251share/doc/qemu/system/devices/canokey.html 264share/doc/qemu/system/devices/canokey.html
252share/doc/qemu/system/devices/ccid.html 265share/doc/qemu/system/devices/ccid.html
253share/doc/qemu/system/devices/cxl.html 266share/doc/qemu/system/devices/cxl.html
254share/doc/qemu/system/devices/igb.html 267share/doc/qemu/system/devices/igb.html
255share/doc/qemu/system/devices/ivshmem.html 268share/doc/qemu/system/devices/ivshmem.html
256share/doc/qemu/system/devices/keyboard.html 269share/doc/qemu/system/devices/keyboard.html
257share/doc/qemu/system/devices/net.html 270share/doc/qemu/system/devices/net.html
258share/doc/qemu/system/devices/nvme.html 271share/doc/qemu/system/devices/nvme.html
259share/doc/qemu/system/devices/usb-u2f.html 272share/doc/qemu/system/devices/usb-u2f.html
260share/doc/qemu/system/devices/usb.html 273share/doc/qemu/system/devices/usb.html
 274share/doc/qemu/system/devices/vhost-user-input.html
261share/doc/qemu/system/devices/vhost-user-rng.html 275share/doc/qemu/system/devices/vhost-user-rng.html
262share/doc/qemu/system/devices/vhost-user.html 276share/doc/qemu/system/devices/vhost-user.html
263share/doc/qemu/system/devices/virtio-gpu.html 277share/doc/qemu/system/devices/virtio-gpu.html
264share/doc/qemu/system/devices/virtio-pmem.html 278share/doc/qemu/system/devices/virtio-pmem.html
265share/doc/qemu/system/devices/virtio-snd.html 279share/doc/qemu/system/devices/virtio-snd.html
266share/doc/qemu/system/gdb.html 280share/doc/qemu/system/gdb.html
267share/doc/qemu/system/generic-loader.html 281share/doc/qemu/system/generic-loader.html
268share/doc/qemu/system/guest-loader.html 282share/doc/qemu/system/guest-loader.html
269share/doc/qemu/system/i386/amd-memory-encryption.html 283share/doc/qemu/system/i386/amd-memory-encryption.html
270share/doc/qemu/system/i386/cpu.html 284share/doc/qemu/system/i386/cpu.html
271share/doc/qemu/system/i386/hyperv.html 285share/doc/qemu/system/i386/hyperv.html
272share/doc/qemu/system/i386/kvm-pv.html 286share/doc/qemu/system/i386/kvm-pv.html
273share/doc/qemu/system/i386/microvm.html 287share/doc/qemu/system/i386/microvm.html
@@ -279,26 +293,27 @@ share/doc/qemu/system/index.html @@ -279,26 +293,27 @@ share/doc/qemu/system/index.html
279share/doc/qemu/system/introduction.html 293share/doc/qemu/system/introduction.html
280share/doc/qemu/system/invocation.html 294share/doc/qemu/system/invocation.html
281share/doc/qemu/system/keys.html 295share/doc/qemu/system/keys.html
282share/doc/qemu/system/linuxboot.html 296share/doc/qemu/system/linuxboot.html
283share/doc/qemu/system/loongarch/virt.html 297share/doc/qemu/system/loongarch/virt.html
284share/doc/qemu/system/managed-startup.html 298share/doc/qemu/system/managed-startup.html
285share/doc/qemu/system/monitor.html 299share/doc/qemu/system/monitor.html
286share/doc/qemu/system/multi-process.html 300share/doc/qemu/system/multi-process.html
287share/doc/qemu/system/mux-chardev.html 301share/doc/qemu/system/mux-chardev.html
288share/doc/qemu/system/openrisc/cpu-features.html 302share/doc/qemu/system/openrisc/cpu-features.html
289share/doc/qemu/system/openrisc/emulation.html 303share/doc/qemu/system/openrisc/emulation.html
290share/doc/qemu/system/openrisc/or1k-sim.html 304share/doc/qemu/system/openrisc/or1k-sim.html
291share/doc/qemu/system/openrisc/virt.html 305share/doc/qemu/system/openrisc/virt.html
 306share/doc/qemu/system/ppc/amigang.html
292share/doc/qemu/system/ppc/embedded.html 307share/doc/qemu/system/ppc/embedded.html
293share/doc/qemu/system/ppc/powermac.html 308share/doc/qemu/system/ppc/powermac.html
294share/doc/qemu/system/ppc/powernv.html 309share/doc/qemu/system/ppc/powernv.html
295share/doc/qemu/system/ppc/ppce500.html 310share/doc/qemu/system/ppc/ppce500.html
296share/doc/qemu/system/ppc/prep.html 311share/doc/qemu/system/ppc/prep.html
297share/doc/qemu/system/ppc/pseries.html 312share/doc/qemu/system/ppc/pseries.html
298share/doc/qemu/system/pr-manager.html 313share/doc/qemu/system/pr-manager.html
299share/doc/qemu/system/qemu-block-drivers.html 314share/doc/qemu/system/qemu-block-drivers.html
300share/doc/qemu/system/qemu-cpu-models.html 315share/doc/qemu/system/qemu-cpu-models.html
301share/doc/qemu/system/qemu-manpage.html 316share/doc/qemu/system/qemu-manpage.html
302share/doc/qemu/system/replay.html 317share/doc/qemu/system/replay.html
303share/doc/qemu/system/riscv/microchip-icicle-kit.html 318share/doc/qemu/system/riscv/microchip-icicle-kit.html
304share/doc/qemu/system/riscv/shakti-c.html 319share/doc/qemu/system/riscv/shakti-c.html
@@ -381,26 +396,27 @@ share/qemu/efi-e1000e.rom @@ -381,26 +396,27 @@ share/qemu/efi-e1000e.rom
381share/qemu/efi-eepro100.rom 396share/qemu/efi-eepro100.rom
382share/qemu/efi-ne2k_pci.rom 397share/qemu/efi-ne2k_pci.rom
383share/qemu/efi-pcnet.rom 398share/qemu/efi-pcnet.rom
384share/qemu/efi-rtl8139.rom 399share/qemu/efi-rtl8139.rom
385share/qemu/efi-virtio.rom 400share/qemu/efi-virtio.rom
386share/qemu/efi-vmxnet3.rom 401share/qemu/efi-vmxnet3.rom
387share/qemu/firmware/50-edk2-i386-secure.json 402share/qemu/firmware/50-edk2-i386-secure.json
388share/qemu/firmware/50-edk2-x86_64-secure.json 403share/qemu/firmware/50-edk2-x86_64-secure.json
389share/qemu/firmware/60-edk2-aarch64.json 404share/qemu/firmware/60-edk2-aarch64.json
390share/qemu/firmware/60-edk2-arm.json 405share/qemu/firmware/60-edk2-arm.json
391share/qemu/firmware/60-edk2-i386.json 406share/qemu/firmware/60-edk2-i386.json
392share/qemu/firmware/60-edk2-x86_64.json 407share/qemu/firmware/60-edk2-x86_64.json
393share/qemu/hppa-firmware.img 408share/qemu/hppa-firmware.img
 409share/qemu/hppa-firmware64.img
394share/qemu/keymaps/ar 410share/qemu/keymaps/ar
395share/qemu/keymaps/bepo 411share/qemu/keymaps/bepo
396share/qemu/keymaps/cz 412share/qemu/keymaps/cz
397share/qemu/keymaps/da 413share/qemu/keymaps/da
398share/qemu/keymaps/de 414share/qemu/keymaps/de
399share/qemu/keymaps/de-ch 415share/qemu/keymaps/de-ch
400share/qemu/keymaps/en-gb 416share/qemu/keymaps/en-gb
401share/qemu/keymaps/en-us 417share/qemu/keymaps/en-us
402share/qemu/keymaps/es 418share/qemu/keymaps/es
403share/qemu/keymaps/et 419share/qemu/keymaps/et
404share/qemu/keymaps/fi 420share/qemu/keymaps/fi
405share/qemu/keymaps/fo 421share/qemu/keymaps/fo
406share/qemu/keymaps/fr 422share/qemu/keymaps/fr
cvs diff -r1.216 -r1.217 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2024/03/04 18:46:38 1.216
+++ pkgsrc/emulators/qemu/distinfo 2024/04/24 07:20:59 1.217
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.216 2024/03/04 18:46:38 adam Exp $ 1$NetBSD: distinfo,v 1.217 2024/04/24 07:20:59 adam Exp $
2 2
3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321 3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43 4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes 5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
6BLAKE2s (qemu-8.2.2.tar.xz) = f24a5b17834a3317580fb7ef6e49c027d4e4e20151cdebb9f88c62cd9e790286 6BLAKE2s (qemu-9.0.0.tar.xz) = c284922daf1b760b5e506e10044c41a850bc7edb481fdaf90818d86ce81c99ce
7SHA512 (qemu-8.2.2.tar.xz) = dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41 7SHA512 (qemu-9.0.0.tar.xz) = 1603517cd4c93632ba60ad7261eb67374f12a744bf58f10b0e8686e46d3a02d8b6bf58a0c617f23a1868084aaba6386c24341894f75539e0b816091718721427
8Size (qemu-8.2.2.tar.xz) = 129398020 bytes 8Size (qemu-9.0.0.tar.xz) = 129789856 bytes
9SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f 9SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
10SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a 10SHA1 (patch-hw-mips-Kconfig) = 77bebb1bcb68d8cbce23b4c16f965f99f0a43581
11SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853 11SHA1 (patch-hw-mips-mipssim.c) = 1683a52c0f065a5adb342f0a71bc63d3e7ffd931
12SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2 12SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
13SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced 13SHA1 (patch-hw_mips_meson.build) = 78bba0051a162bd1caec8273bc29cb15bb335fd4
14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
16SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310 16SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
17SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33 17SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
18SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43 18SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
19SHA1 (patch-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca 19SHA1 (patch-meson.build) = 6b0607903b84c84d26bd5c54f3f0b9e4b256d787
20SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2 20SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
21SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e 21SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
22SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66 22SHA1 (patch-target_i386_cpu.c) = f55795305c385784caee00c2a767a1cafa42ed91
23SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c 23SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
24SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f 24SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f
25SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a 25SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
26SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25 26SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25
cvs diff -r1.3 -r1.4 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c 2023/12/28 17:15:39 1.3
+++ pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c 2024/04/24 07:20:59 1.4
@@ -30,27 +30,26 @@ @@ -30,27 +30,26 @@
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include "qemu/osdep.h" 34#include "qemu/osdep.h"
35#include "qapi/error.h" 35#include "qapi/error.h"
36#include "cpu.h" 36#include "cpu.h"
37#include "hw/mips/mips.h" 37#include "hw/mips/mips.h"
38#include "hw/char/serial.h" 38#include "hw/char/serial.h"
39#include "hw/isa/isa.h" 39#include "hw/isa/isa.h"
40#include "net/net.h" 40#include "net/net.h"
41#include "sysemu/sysemu.h" 41#include "sysemu/sysemu.h"
42#include "hw/boards.h" 42#include "hw/boards.h"
43#include "hw/mips/bios.h" 
44#include "hw/loader.h" 43#include "hw/loader.h"
45#include "hw/or-irq.h" 44#include "hw/or-irq.h"
46#include "elf.h" 45#include "elf.h"
47#include "hw/sysbus.h" 46#include "hw/sysbus.h"
48#include "hw/qdev-properties.h" 47#include "hw/qdev-properties.h"
49#include "exec/address-spaces.h" 48#include "exec/address-spaces.h"
50#include "qemu/error-report.h" 49#include "qemu/error-report.h"
51#include "sysemu/qtest.h" 50#include "sysemu/qtest.h"
52#include "sysemu/reset.h" 51#include "sysemu/reset.h"
53#include "hw/virtio/virtio-mmio.h" 52#include "hw/virtio/virtio-mmio.h"
54 53
55#define NUM_VIRTIO_TRANSPORTS 32 54#define NUM_VIRTIO_TRANSPORTS 32
56#define VIRTIO_STRIDE 512 55#define VIRTIO_STRIDE 512
cvs diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig 2021/02/20 22:59:29 1.3
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig 2024/04/24 07:20:59 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-hw-mips-Kconfig,v 1.3 2021/02/20 22:59:29 ryoon Exp $ 1$NetBSD: patch-hw-mips-Kconfig,v 1.4 2024/04/24 07:20:59 adam Exp $
2 2
3--- hw/mips/Kconfig.orig 2020-08-11 19:17:15.000000000 +0000 3--- hw/mips/Kconfig.orig 2024-04-10 17:43:25.000000000 +0000
4+++ hw/mips/Kconfig 4+++ hw/mips/Kconfig
5@@ -20,6 +20,8 @@ config MIPSSIM 5@@ -15,6 +15,8 @@ config MIPSSIM
6 select ISA_BUS 6 bool
7 select SERIAL_ISA 7 select SERIAL
8 select MIPSNET 8 select MIPSNET
9+ select VIRTIO_MMIO 9+ select VIRTIO_MMIO
10+ select OR_IRQ 10+ select OR_IRQ
11  11
12 config JAZZ 12 config JAZZ
13 bool 13 bool
cvs diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build 2021/08/27 03:32:37 1.3
+++ pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build 2024/04/24 07:20:59 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-hw_mips_meson.build,v 1.3 2021/08/27 03:32:37 ryoon Exp $ 1$NetBSD: patch-hw_mips_meson.build,v 1.4 2024/04/24 07:20:59 adam Exp $
2 2
3--- hw/mips/meson.build.orig 2021-08-04 16:29:07.000000000 +0000 3--- hw/mips/meson.build.orig 2024-04-10 17:43:25.000000000 +0000
4+++ hw/mips/meson.build 4+++ hw/mips/meson.build
5@@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_ 5@@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_
6  6
7 if 'CONFIG_TCG' in config_all 7 if 'CONFIG_TCG' in config_all_accel
8 mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) 8 mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
9-mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) 9-mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
10+mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c', 'mipssim_virtio.c')) 10+mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c', 'mipssim_virtio.c'))
11 mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) 11 mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
12 mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) 12 mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt])
13 endif 13 endif
cvs diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c 2023/12/28 17:15:39 1.3
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c 2024/04/24 07:20:59 1.4
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-target_i386_cpu.c,v 1.3 2023/12/28 17:15:39 adam Exp $ 1$NetBSD: patch-target_i386_cpu.c,v 1.4 2024/04/24 07:20:59 adam Exp $
2 2
3Permit to use `-cpu host' with NVMM. 3Permit to use `-cpu host' with NVMM.
4 4
5--- target/i386/cpu.c.orig 2023-12-19 21:24:34.000000000 +0000 5--- target/i386/cpu.c.orig 2024-04-10 17:43:26.000000000 +0000
6+++ target/i386/cpu.c 6+++ target/i386/cpu.c
7@@ -26,6 +26,7 @@ 7@@ -25,6 +25,7 @@
 8 #include "cpu.h"
8 #include "tcg/helper-tcg.h" 9 #include "tcg/helper-tcg.h"
9 #include "sysemu/reset.h" 
10 #include "sysemu/hvf.h" 10 #include "sysemu/hvf.h"
11+#include "sysemu/nvmm.h" 11+#include "sysemu/nvmm.h"
12 #include "hvf/hvf-i386.h" 12 #include "hvf/hvf-i386.h"
13 #include "kvm/kvm_i386.h" 13 #include "kvm/kvm_i386.h"
14 #include "sev.h" 14 #include "sev.h"
15@@ -1643,7 +1644,7 @@ uint32_t xsave_area_size(uint64_t mask, 15@@ -1644,7 +1645,7 @@ uint32_t xsave_area_size(uint64_t mask,
16  16
17 static inline bool accel_uses_host_cpuid(void) 17 static inline bool accel_uses_host_cpuid(void)
18 { 18 {
19- return kvm_enabled() || hvf_enabled(); 19- return kvm_enabled() || hvf_enabled();
20+ return kvm_enabled() || hvf_enabled() || nvmm_enabled(); 20+ return kvm_enabled() || hvf_enabled() || nvmm_enabled();
21 } 21 }
22  22
23 static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu) 23 static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
24@@ -7314,7 +7315,8 @@ static void x86_cpu_realizefn(DeviceStat 24@@ -7325,7 +7326,8 @@ static void x86_cpu_realizefn(DeviceStat
25  25
26 if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) { 26 if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
27 g_autofree char *name = x86_cpu_class_get_model_name(xcc); 27 g_autofree char *name = x86_cpu_class_get_model_name(xcc);
28- error_setg(&local_err, "CPU model '%s' requires KVM or HVF", name); 28- error_setg(&local_err, "CPU model '%s' requires KVM or HVF", name);
29+ error_setg(&local_err, 29+ error_setg(&local_err,
30+ "CPU model '%s' requires KVM or HVF or NVMM", name); 30+ "CPU model '%s' requires KVM or HVF or NVMM", name);
31 goto out; 31 goto out;
32 } 32 }
33  33
cvs diff -r1.4 -r1.5 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c 2021/08/27 03:32:37 1.4
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c 2024/04/24 07:20:59 1.5
@@ -1,75 +1,53 @@ @@ -1,75 +1,53 @@
1$NetBSD: patch-hw-mips-mipssim.c,v 1.4 2021/08/27 03:32:37 ryoon Exp $ 1$NetBSD: patch-hw-mips-mipssim.c,v 1.5 2024/04/24 07:20:59 adam Exp $
2 2
3--- hw/mips/mipssim.c.orig 2021-08-04 16:29:07.000000000 +0000 3--- hw/mips/mipssim.c.orig 2024-04-10 17:43:25.000000000 +0000
4+++ hw/mips/mipssim.c 4+++ hw/mips/mipssim.c
5@@ -39,12 +39,20 @@ 5@@ -36,6 +36,7 @@
 6 #include "sysemu/sysemu.h"
6 #include "hw/boards.h" 7 #include "hw/boards.h"
7 #include "hw/mips/bios.h" 
8 #include "hw/loader.h" 8 #include "hw/loader.h"
9+#include "hw/or-irq.h" 9+#include "hw/or-irq.h"
10 #include "elf.h" 10 #include "elf.h"
11 #include "hw/sysbus.h" 11 #include "hw/sysbus.h"
12 #include "hw/qdev-properties.h" 12 #include "hw/qdev-properties.h"
13 #include "qemu/error-report.h" 13@@ -136,7 +137,7 @@ static void mipsnet_init(int base, qemu_
14 #include "sysemu/qtest.h" 
15 #include "sysemu/reset.h" 
16+#include "hw/virtio/virtio-mmio.h" 
17+ 
18+#define NUM_VIRTIO_TRANSPORTS 32 
19+ 
20+#define DEV_SPACING 0x10000 /* space devices every 64k */ 
21+#define ISA_BASE 0x1fd00000 
22+#define VIRTIO_MMIO_BASE (ISA_BASE + DEV_SPACING) 
23  
24 static struct _loaderparams { 
25 int ram_size; 
26@@ -135,7 +143,7 @@ static void mipsnet_init(int base, qemu_ 
27 sysbus_mmio_get_region(s, 0)); 14 sysbus_mmio_get_region(s, 0));
28 } 15 }
29  16
30-static void 17-static void
31+void 18+void
32 mips_mipssim_init(MachineState *machine) 19 mips_mipssim_init(MachineState *machine)
33 { 20 {
34 const char *kernel_filename = machine->kernel_filename; 21 const char *kernel_filename = machine->kernel_filename;
35@@ -146,6 +154,7 @@ mips_mipssim_init(MachineState *machine) 22@@ -147,6 +148,7 @@ mips_mipssim_init(MachineState *machine)
36 MemoryRegion *isa = g_new(MemoryRegion, 1); 23 MemoryRegion *isa = g_new(MemoryRegion, 1);
37 MemoryRegion *bios = g_new(MemoryRegion, 1); 24 MemoryRegion *bios = g_new(MemoryRegion, 1);
38 Clock *cpuclk; 25 Clock *cpuclk;
39+ DeviceState *virtio_orgate; 26+ DeviceState *virtio_orgate;
40 MIPSCPU *cpu; 27 MIPSCPU *cpu;
41 CPUMIPSState *env; 28 CPUMIPSState *env;
42 ResetData *reset_info; 29 ResetData *reset_info;
43@@ -208,7 +217,7 @@ mips_mipssim_init(MachineState *machine) 30@@ -233,6 +235,23 @@ mips_mipssim_init(MachineState *machine)
44 /* Register 64 KB of ISA IO space at 0x1fd00000. */ 
45 memory_region_init_alias(isa, NULL, "isa_mmio", 
46 get_system_io(), 0, 0x00010000); 
47- memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa); 
48+ memory_region_add_subregion(get_system_memory(), ISA_BASE, isa); 
49  31
50 /* 32 /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
51 * A single 16450 sits at offset 0x3f8. It is attached to 33 mipsnet_init(0x4200, env->irq[2]);
52@@ -229,6 +238,23 @@ mips_mipssim_init(MachineState *machine) 
53 if (nd_table[0].used) 
54 /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ 
55 mipsnet_init(0x4200, env->irq[2], &nd_table[0]); 
56+ 34+
57+ /* 35+ /*
58+ * virtio extention; register 32 virtio devices just after the ISA space 36+ * virtio extention; register 32 virtio devices just after the ISA space
59+ * at 0x1fd10000 with stride of 512 bytes as per i386s microvm target. 37+ * at 0x1fd10000 with stride of 512 bytes as per i386s microvm target.
60+ * register these devices in reverse order (see comments in hw/arm/virt.c) 38+ * register these devices in reverse order (see comments in hw/arm/virt.c)
61+ */ 39+ */
62+ virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ)); 40+ virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ));
63+ object_property_set_int(OBJECT(virtio_orgate), 41+ object_property_set_int(OBJECT(virtio_orgate),
64+ "num-lines", NUM_VIRTIO_TRANSPORTS, &error_fatal); 42+ "num-lines", 32 /*NUM_VIRTIO_TRANSPORTS*/, &error_fatal);
65+ qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal); 43+ qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal);
66+ 44+
67+ for (int i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) { 45+ for (int i = 31 /*NUM_VIRTIO_TRANSPORTS - 1*/; i >= 0; i--) {
68+ sysbus_create_simple("virtio-mmio", 46+ sysbus_create_simple("virtio-mmio",
69+ 0x1fd10000 + i * 512, 47+ 0x1fd10000 + i * 512,
70+ qdev_get_gpio_in(virtio_orgate, i)); 48+ qdev_get_gpio_in(virtio_orgate, i));
71+ } 49+ }
72+ qdev_connect_gpio_out(DEVICE(virtio_orgate), 0, env->irq[3]); 50+ qdev_connect_gpio_out(DEVICE(virtio_orgate), 0, env->irq[3]);
73 } 51 }
74  52
75 static void mips_mipssim_machine_init(MachineClass *mc) 53 static void mips_mipssim_machine_init(MachineClass *mc)
cvs diff -r1.14 -r1.15 pkgsrc/emulators/qemu/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-meson.build 2023/09/27 08:24:04 1.14
+++ pkgsrc/emulators/qemu/patches/patch-meson.build 2024/04/24 07:20:59 1.15
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-meson.build,v 1.14 2023/09/27 08:24:04 adam Exp $ 1$NetBSD: patch-meson.build,v 1.15 2024/04/24 07:20:59 adam Exp $
2 2
3* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv) 3* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
4 to fix qemu-system-aarch64 link. 4 to fix qemu-system-aarch64 link.
5* Detect curses (non-ncurses{,w} too) 5* Detect curses (non-ncurses{,w} too)
6 6
7--- meson.build.orig 2023-08-22 15:34:02.000000000 +0000 7--- meson.build.orig 2024-04-10 17:43:26.000000000 +0000
8+++ meson.build 8+++ meson.build
9@@ -1184,7 +1184,7 @@ if have_system and get_option('curses'). 9@@ -1329,7 +1329,7 @@ if have_system and get_option('curses').
10 has_curses_h = cc.has_header('curses.h', args: curses_compile_args) 10 has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
11 endif 11 endif
12 if has_curses_h 12 if has_curses_h
13- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) 13- curses_libname_list = (host_os == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
14+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses']) 14+ curses_libname_list = (host_os == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
15 foreach curses_libname : curses_libname_list 15 foreach curses_libname : curses_libname_list
16 libcurses = cc.find_library(curses_libname, 16 libcurses = cc.find_library(curses_libname,
17 required: false) 17 required: false)
18@@ -1201,7 +1201,7 @@ if have_system and get_option('curses'). 18@@ -1346,7 +1346,7 @@ if have_system and get_option('curses').
19 endif 19 endif
20 endif 20 endif
21 if get_option('iconv').allowed() 21 if get_option('iconv').allowed()
22- foreach link_args : [ ['-liconv'], [] ] 22- foreach link_args : [ ['-liconv'], [] ]
23+ foreach link_args : [ [], ['-liconv'] ] 23+ foreach link_args : [ [], ['-liconv'] ]
24 # Programs will be linked with glib and this will bring in libiconv on FreeBSD. 24 # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
25 # We need to use libiconv if available because mixing libiconv's headers with 25 # We need to use libiconv if available because mixing libiconv's headers with
26 # the system libc does not work. 26 # the system libc does not work.