CVS commit: pkgsrc/emulators/qemu

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/qemu
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 5 Jan 2026 10:11:38 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan  5 10:11:38 UTC 2026

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo version.mk
        pkgsrc/emulators/qemu/patches: patch-fsdev_file-op-9p.h
            patch-fsdev_meson.build patch-hw-mips-Kconfig
            patch-hw_9pfs_9p-synth.c patch-hw_9pfs_9p-util.h patch-hw_9pfs_9p.c
            patch-hw_9pfs_meson.build patch-meson.build
Removed Files:
        pkgsrc/emulators/qemu/files: hw-mips-mipssim_virtio.c
        pkgsrc/emulators/qemu/patches: patch-hw-mips-mipssim.c
            patch-hw_mips_meson.build

Log Message:
qemu: updated to 10.2.0

10.2.0
https://wiki.qemu.org/ChangeLog/10.2

Removed features and incompatible changes
* The -old-param option has been removed
* The Arm pxa CPU family has been removed


To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.393 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.244 -r1.245 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/qemu/version.mk
cvs rdiff -u -r1.6 -r0 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h \
    pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build \
    pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c \
    pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h \
    pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c \
    pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
cvs rdiff -u -r1.7 -r0 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/qemu/patches/patch-meson.build

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.392 pkgsrc/emulators/qemu/Makefile:1.393
--- pkgsrc/emulators/qemu/Makefile:1.392        Fri Jan  2 05:16:24 2026
+++ pkgsrc/emulators/qemu/Makefile      Mon Jan  5 10:11:37 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.392 2026/01/02 05:16:24 riastradh Exp $
+# $NetBSD: Makefile,v 1.393 2026/01/05 10:11:37 adam Exp $
 
 .include "../../emulators/qemu/version.mk"
 
 DISTNAME=      qemu-${QEMU_VERSION}
-PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -195,7 +194,6 @@ PYTHON_FOR_BUILD_ONLY=      tool
 
 post-extract:
        cp ${WRKDIR}/${PALCODE_CLIPPER} ${WRKSRC}/pc-bios/palcode-clipper
-       cp ${FILESDIR}/hw-mips-mipssim_virtio.c ${WRKSRC}/hw/mips/mipssim_virtio.c
 
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.101 pkgsrc/emulators/qemu/PLIST:1.102
--- pkgsrc/emulators/qemu/PLIST:1.101   Mon Sep 29 14:11:07 2025
+++ pkgsrc/emulators/qemu/PLIST Mon Jan  5 10:11:37 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.101 2025/09/29 14:11:07 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.102 2026/01/05 10:11:37 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -86,8 +86,8 @@ ${PLIST.doc}man/man8/qemu-nbd.8
 ${PLIST.doc}man/man8/qemu-pr-helper.8
 share/applications/qemu.desktop
 ${PLIST.doc}share/doc/qemu/.buildinfo
-share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/README.NetBSD
+${PLIST.doc}share/doc/qemu/Makefile.multinode-NetBSD
+${PLIST.doc}share/doc/qemu/README.NetBSD
 ${PLIST.doc}share/doc/qemu/about/build-platforms.html
 ${PLIST.doc}share/doc/qemu/about/deprecated.html
 ${PLIST.doc}share/doc/qemu/about/emulation.html
@@ -297,6 +297,7 @@ ${PLIST.doc}share/doc/qemu/system/device
 ${PLIST.doc}share/doc/qemu/system/devices/canokey.html
 ${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/emmc.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
@@ -306,12 +307,12 @@ ${PLIST.doc}share/doc/qemu/system/device
 ${PLIST.doc}share/doc/qemu/system/devices/usb-u2f.html
 ${PLIST.doc}share/doc/qemu/system/devices/usb.html
 ${PLIST.doc}share/doc/qemu/system/devices/vfio-user.html
-${PLIST.doc}share/doc/qemu/system/devices/vhost-user-input.html
-${PLIST.doc}share/doc/qemu/system/devices/vhost-user-rng.html
-${PLIST.doc}share/doc/qemu/system/devices/vhost-user.html
-${PLIST.doc}share/doc/qemu/system/devices/virtio-gpu.html
-${PLIST.doc}share/doc/qemu/system/devices/virtio-pmem.html
-${PLIST.doc}share/doc/qemu/system/devices/virtio-snd.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/index.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/vhost-user-contrib.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/vhost-user.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/virtio-gpu.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/virtio-pmem.html
+${PLIST.doc}share/doc/qemu/system/devices/virtio/virtio-snd.html
 ${PLIST.doc}share/doc/qemu/system/gdb.html
 ${PLIST.doc}share/doc/qemu/system/generic-loader.html
 ${PLIST.doc}share/doc/qemu/system/guest-loader.html
@@ -426,6 +427,8 @@ share/qemu/bios-microvm.bin
 share/qemu/bios.bin
 share/qemu/dtb/bamboo.dtb
 share/qemu/dtb/canyonlands.dtb
+share/qemu/dtb/pegasos1.dtb
+share/qemu/dtb/pegasos2.dtb
 share/qemu/dtb/petalogix-ml605.dtb
 share/qemu/dtb/petalogix-s3adsp1800.dtb
 share/qemu/edk2-aarch64-code.fd
@@ -521,7 +524,7 @@ share/qemu/s390-ccw.img
 share/qemu/skiboot.lid
 share/qemu/slof.bin
 share/qemu/trace-events-all
-share/qemu/u-boot-sam460-20100605.bin
+share/qemu/u-boot-sam460.bin
 share/qemu/u-boot.e500
 share/qemu/vgabios-ati.bin
 share/qemu/vgabios-bochs-display.bin

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.244 pkgsrc/emulators/qemu/distinfo:1.245
--- pkgsrc/emulators/qemu/distinfo:1.244        Fri Jan  2 05:16:24 2026
+++ pkgsrc/emulators/qemu/distinfo      Mon Jan  5 10:11:37 2026
@@ -1,29 +1,27 @@
-$NetBSD: distinfo,v 1.244 2026/01/02 05:16:24 riastradh Exp $
+$NetBSD: distinfo,v 1.245 2026/01/05 10:11:37 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-10.1.3.tar.xz) = ed09dd466413d070a10444a997db42ef92fe9e72ad52f55175a8991e65631c7d
-SHA512 (qemu-10.1.3.tar.xz) = 67608a5a422c93c494159d649a0afb296231ec2d96a6fc03b119375da4180162ba25a74bb6204a8cb36375709c1f682ef56c42961816dc2107f4d67bb8e10db4
-Size (qemu-10.1.3.tar.xz) = 142006316 bytes
+BLAKE2s (qemu-10.2.0.tar.xz) = a75ae7cb628ecc16659b572f0b061a3b367c6b6e18b40c4cc7cf5c36f7176625
+SHA512 (qemu-10.2.0.tar.xz) = cd910090cf8146fdd30151bded8bebe43d9e7fce8b84d9f87130a99d0bd908f310f4bef5484b53a56c29dd7a08410890d02d0a7ab90ce6af73522ff8ba5b364e
+Size (qemu-10.2.0.tar.xz) = 141093360 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) = dcb363d2c27f963394b8ae00a64b33c263d30900
-SHA1 (patch-hw_9pfs_9p-synth.c) = f6af717a11d1cc7851f6dd388c7030264e1ee772
-SHA1 (patch-hw_9pfs_9p-util.h) = c286ea007f0ca3250442afe45c22dbeac640a077
-SHA1 (patch-hw_9pfs_9p.c) = 05c418eebf501dfbfff686d66d32953a1a41f9ca
+SHA1 (patch-fsdev_file-op-9p.h) = 1cf9f8602dca42b82f3d10e67c9bcd6aa971c7cc
+SHA1 (patch-fsdev_meson.build) = e8c523b27170b32ad95bbdc14cb3785d4b3d0f17
+SHA1 (patch-hw-mips-Kconfig) = 967cf02da1577bcee0c06997d981c5aa01b75424
+SHA1 (patch-hw_9pfs_9p-synth.c) = 58ca01903acc4a5f419e9122a3066bfae88be9b9
+SHA1 (patch-hw_9pfs_9p-util.h) = cbdb950da2b68f78a264eb4bb911befe9c0effe6
+SHA1 (patch-hw_9pfs_9p.c) = fd0455e5a742b464961a6cc41d8b1d57b5a894e4
 SHA1 (patch-hw_9pfs_9p.h) = 4e2749619d2154f9fb341047aa278371b298e8a4
 SHA1 (patch-hw_9pfs_codir.c) = c065762ee13fdeaef063632f56d9d0ead6b68f61
-SHA1 (patch-hw_9pfs_meson.build) = d6d754fb38b4b0f95bdb8bebbe18e8adad035e26
-SHA1 (patch-hw_mips_meson.build) = 06cc199b3b15add9f5d5ddcd84bf2791f96bd5d3
+SHA1 (patch-hw_9pfs_meson.build) = 0fb98920bd0678c00c035dc1178edab526ecbc19
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_pci-host_q35.c) = 363877618de78b422e53098808add0d7d653a612
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = f148a3ad6d72eb29f85684316af5fb219ddaeb71
-SHA1 (patch-meson.build) = 8a76d92303efa054b37d46b27d76d0fb75c15133
+SHA1 (patch-meson.build) = 2280e0b23b7a1e5e1c1208b9b5857a56676e58b4
 SHA1 (patch-qemu-options.hx) = 6cf811ae421db1e8d45f7098bd36733c6dc7d9cf
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = 11663f670c6ca1b9e523b0d16843d87a6061b9a2

Index: pkgsrc/emulators/qemu/version.mk
diff -u pkgsrc/emulators/qemu/version.mk:1.10 pkgsrc/emulators/qemu/version.mk:1.11
--- pkgsrc/emulators/qemu/version.mk:1.10       Fri Dec 12 09:42:00 2025
+++ pkgsrc/emulators/qemu/version.mk    Mon Jan  5 10:11:37 2026
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.10 2025/12/12 09:42:00 adam Exp $
+# $NetBSD: version.mk,v 1.11 2026/01/05 10:11:37 adam Exp $
 #
 # used by emulators/qemu
 # used by sysutils/qemu-guest-agent
 
-QEMU_VERSION?= 10.1.3
+QEMU_VERSION?= 10.2.0

Index: pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h
diff -u pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h:1.1 pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h:1.2
--- pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h:1.1  Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-fsdev_file-op-9p.h      Mon Jan  5 10:11:37 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-fsdev_file-op-9p.h,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-fsdev_file-op-9p.h,v 1.2 2026/01/05 10:11:37 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- fsdev/file-op-9p.h.orig    2024-12-10 23:46:36.000000000 +0000
+--- fsdev/file-op-9p.h.orig    2025-12-23 19:48:56.000000000 +0000
 +++ fsdev/file-op-9p.h
-@@ -26,6 +26,11 @@
- # include <sys/param.h>
+@@ -28,6 +28,11 @@
+ # endif
  # include <sys/mount.h>
  #endif
 +#ifdef __NetBSD__
Index: pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build:1.1 pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build:1.2
--- pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build:1.1   Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-fsdev_meson.build       Mon Jan  5 10:11:37 2026
@@ -1,14 +1,14 @@
-$NetBSD: patch-fsdev_meson.build,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-fsdev_meson.build,v 1.2 2026/01/05 10:11:37 adam Exp $
 
 Enable fsdev support on NetBSD.
 
---- fsdev/meson.build.orig     2024-12-10 23:46:36.000000000 +0000
+--- fsdev/meson.build.orig     2025-12-23 19:48:56.000000000 +0000
 +++ fsdev/meson.build
-@@ -5,6 +5,6 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], 
+@@ -5,6 +5,6 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'],
    '9p-marshal.c',
    'qemu-fsdev.c',
  ), if_false: files('qemu-fsdev-dummy.c'))
--if host_os in ['linux', 'darwin']
-+if host_os in ['linux', 'darwin', 'netbsd']
+-if host_os in ['linux', 'darwin', 'freebsd']
++if host_os in ['linux', 'darwin', 'freebsd', 'netbsd']
    system_ss.add_all(fsdev_ss)
  endif
Index: pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c:1.1 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c:1.1  Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-synth.c      Mon Jan  5 10:11:38 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_9pfs_9p-synth.c,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-hw_9pfs_9p-synth.c,v 1.2 2026/01/05 10:11:38 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- hw/9pfs/9p-synth.c.orig    2024-12-10 23:46:36.000000000 +0000
+--- hw/9pfs/9p-synth.c.orig    2025-12-23 19:48:56.000000000 +0000
 +++ hw/9pfs/9p-synth.c
 @@ -230,7 +230,7 @@ static void synth_direntry(V9fsSynthNode
      entry->d_ino = node->attr->inode;
@@ -13,7 +13,7 @@ Add BSD support for fsdev 9p.
      entry->d_off = off + 1;
  #endif
  }
-@@ -433,11 +433,13 @@ static int synth_fsync(FsContext *ctx, i
+@@ -447,11 +447,13 @@ static int synth_fsync(FsContext *ctx, i
  static int synth_statfs(FsContext *s, V9fsPath *fs_path,
                               struct statfs *stbuf)
  {
@@ -23,8 +23,8 @@ Add BSD support for fsdev 9p.
      stbuf->f_bsize = 512;
      stbuf->f_blocks = 0;
      stbuf->f_files = synth_node_count;
--#ifndef CONFIG_DARWIN
-+#ifdef CONFIG_LINUX
+-#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD)
++#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD) && !defined(__NetBSD__)
      stbuf->f_namelen = NAME_MAX;
  #endif
      return 0;
Index: pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h
diff -u pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h:1.1 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h:1.2
--- pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h:1.1   Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p-util.h       Mon Jan  5 10:11:38 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_9pfs_9p-util.h,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-hw_9pfs_9p-util.h,v 1.2 2026/01/05 10:11:38 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- hw/9pfs/9p-util.h.orig     2025-02-24 14:36:36.000000000 +0000
+--- hw/9pfs/9p-util.h.orig     2025-12-23 19:48:56.000000000 +0000
 +++ hw/9pfs/9p-util.h
-@@ -84,6 +84,298 @@ static inline int errno_to_dotl(int err)
+@@ -93,6 +93,298 @@ static inline int errno_to_dotl(int err)
      } else if (err == EOPNOTSUPP) {
          err = 95; /* ==EOPNOTSUPP on Linux */
      }
@@ -303,23 +303,23 @@ Add BSD support for fsdev 9p.
  #else
  #error Missing errno translation to Linux for this host system
  #endif
-@@ -154,13 +446,13 @@ static inline int openat_file(int dirfd,
+@@ -164,13 +456,13 @@ static inline int openat_file(int dirfd,
  {
      int fd, serrno, ret;
  
--#ifndef CONFIG_DARWIN
-+#ifdef O_NOATIME
+-#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD)
++#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD) && defined(O_NOATIME)
  again:
  #endif
      fd = qemu_openat(dirfd, name, flags | O_NOFOLLOW | O_NOCTTY | O_NONBLOCK,
                       mode);
      if (fd == -1) {
--#ifndef CONFIG_DARWIN
-+#ifdef O_NOATIME
+-#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD)
++#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD) && defined(O_NOATIME)
          if (errno == EPERM && (flags & O_NOATIME)) {
              /*
               * The client passed O_NOATIME but we lack permissions to honor it.
-@@ -216,6 +508,7 @@ ssize_t fremovexattrat_nofollow(int dirf
+@@ -229,6 +521,7 @@ ssize_t fremovexattrat_nofollow(int dirf
   * so ensure it is manually injected earlier and call here when
   * needed.
   */
@@ -327,7 +327,7 @@ Add BSD support for fsdev 9p.
  static inline off_t qemu_dirent_off(struct dirent *dent)
  {
  #ifdef CONFIG_DARWIN
-@@ -224,6 +517,7 @@ static inline off_t qemu_dirent_off(stru
+@@ -237,6 +530,7 @@ static inline off_t qemu_dirent_off(stru
      return dent->d_off;
  #endif
  }
Index: pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.1 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.1        Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c    Mon Jan  5 10:11:38 2026
@@ -1,22 +1,19 @@
-$NetBSD: patch-hw_9pfs_9p.c,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-hw_9pfs_9p.c,v 1.2 2026/01/05 10:11:38 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- hw/9pfs/9p.c.orig  2024-12-10 23:46:36.000000000 +0000
+--- hw/9pfs/9p.c.orig  2025-12-23 19:48:56.000000000 +0000
 +++ hw/9pfs/9p.c
-@@ -136,8 +136,10 @@ static int dotl_to_open_flags(int flags)
+@@ -136,7 +136,7 @@ static int dotl_to_open_flags(int flags)
          { P9_DOTL_NONBLOCK, O_NONBLOCK } ,
          { P9_DOTL_DSYNC, O_DSYNC },
          { P9_DOTL_FASYNC, FASYNC },
--#ifndef CONFIG_DARWIN
-+#ifdef O_NOATIME
+-#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD)
++#if !defined(CONFIG_DARWIN) && !defined(CONFIG_FREEBSD) && defined(O_NOATIME)
          { P9_DOTL_NOATIME, O_NOATIME },
-+#endif
-+#ifndef CONFIG_DARWIN
-         /*
-          *  On Darwin, we could map to F_NOCACHE, which is
-          *  similar, but doesn't quite have the same
-@@ -2293,6 +2295,13 @@ static int coroutine_fn v9fs_do_readdir_
+ #endif
+ #ifndef CONFIG_DARWIN
+@@ -2365,6 +2365,13 @@ static int coroutine_fn v9fs_do_readdir_
          if (err || !dent) {
              break;
          }
@@ -30,7 +27,7 @@ Add BSD support for fsdev 9p.
          err = v9fs_co_name_to_path(pdu, &fidp->path, dent->d_name, &path);
          if (err < 0) {
              break;
-@@ -2329,7 +2338,11 @@ static int coroutine_fn v9fs_do_readdir_
+@@ -2401,7 +2408,11 @@ static int coroutine_fn v9fs_do_readdir_
          count += len;
          v9fs_stat_free(&v9stat);
          v9fs_path_free(&path);
@@ -42,7 +39,7 @@ Add BSD support for fsdev 9p.
      }
  
      v9fs_readdir_unlock(&fidp->fs.dir);
-@@ -2530,7 +2543,11 @@ static int coroutine_fn v9fs_do_readdir(
+@@ -2602,7 +2613,11 @@ static int coroutine_fn v9fs_do_readdir(
              qid.version = 0;
          }
  
@@ -54,7 +51,7 @@ Add BSD support for fsdev 9p.
          v9fs_string_init(&name);
          v9fs_string_sprintf(&name, "%s", dent->d_name);
  
-@@ -3575,7 +3592,11 @@ static int v9fs_fill_statfs(V9fsState *s
+@@ -3647,7 +3662,11 @@ static int v9fs_fill_statfs(V9fsState *s
      if (!bsize_factor) {
          bsize_factor = 1;
      }
@@ -66,7 +63,7 @@ Add BSD support for fsdev 9p.
      f_bsize = stbuf->f_bsize;
      f_bsize *= bsize_factor;
      /*
-@@ -3592,10 +3613,14 @@ static int v9fs_fill_statfs(V9fsState *s
+@@ -3664,10 +3683,14 @@ static int v9fs_fill_statfs(V9fsState *s
      fsid_val = (unsigned int)stbuf->f_fsid.val[0] |
                 (unsigned long long)stbuf->f_fsid.val[1] << 32;
      f_namelen = NAME_MAX;
@@ -82,7 +79,7 @@ Add BSD support for fsdev 9p.
  #endif
  
      return pdu_marshal(pdu, offset, "ddqqqqqqd",
-@@ -3966,7 +3991,7 @@ out_nofid:
+@@ -4038,7 +4061,7 @@ out_nofid:
      v9fs_string_free(&name);
  }
  
Index: pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build:1.1 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build:1.2
--- pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build:1.1 Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw_9pfs_meson.build     Mon Jan  5 10:11:38 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-hw_9pfs_meson.build,v 1.1 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-hw_9pfs_meson.build,v 1.2 2026/01/05 10:11:38 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- hw/9pfs/meson.build.orig   2024-12-10 23:46:36.000000000 +0000
+--- hw/9pfs/meson.build.orig   2025-12-23 19:48:56.000000000 +0000
 +++ hw/9pfs/meson.build
-@@ -14,7 +14,7 @@ fs_ss.add(files(
- ))
- if host_os == 'darwin'
+@@ -17,7 +17,7 @@ if host_os == 'darwin'
    fs_ss.add(files('9p-util-darwin.c'))
+ elif host_os == 'freebsd'
+   fs_ss.add(files('9p-util-freebsd.c'))
 -elif host_os == 'linux'
 +elif host_os == 'linux' or host_os == 'netbsd'
    fs_ss.add(files('9p-util-linux.c'))

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.7 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.8
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.7     Sun Mar  2 12:44:19 2025
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig Mon Jan  5 10:11:38 2026
@@ -1,14 +1,14 @@
-$NetBSD: patch-hw-mips-Kconfig,v 1.7 2025/03/02 12:44:19 nia Exp $
+$NetBSD: patch-hw-mips-Kconfig,v 1.8 2026/01/05 10:11:38 adam Exp $
 
 Adding support for VirtIO extensions to the MIPSSIM machine,
 which NetBSD has special extensions to support.
 
---- hw/mips/Kconfig.orig       2024-12-10 23:46:36.000000000 +0000
+--- hw/mips/Kconfig.orig       2025-12-23 19:48:56.000000000 +0000
 +++ hw/mips/Kconfig
-@@ -19,6 +19,8 @@ config MIPSSIM
-     depends on MIPS
+@@ -12,6 +12,8 @@ config MALTA
+     select PFLASH_CFI01
      select SERIAL_MM
-     select MIPSNET
+     select SMBUS_EEPROM
 +    select VIRTIO_MMIO
 +    select OR_IRQ
  

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.16 pkgsrc/emulators/qemu/patches/patch-meson.build:1.17
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.16        Sat Mar 15 20:19:15 2025
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Mon Jan  5 10:11:38 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-meson.build,v 1.16 2025/03/15 20:19:15 riastradh Exp $
+$NetBSD: patch-meson.build,v 1.17 2026/01/05 10:11:38 adam Exp $
 
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
 * Detect curses (non-ncurses{,w} too)
 * Allow building fsdev on non-Linux/Darwin
 
---- meson.build.orig   2024-12-10 23:46:36.000000000 +0000
+--- meson.build.orig   2025-12-23 19:48:56.000000000 +0000
 +++ meson.build
-@@ -1471,7 +1471,7 @@ if have_system and get_option('curses').
+@@ -1544,7 +1544,7 @@ if have_system and get_option('curses').
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
      if has_curses_h
@@ -16,7 +16,7 @@ $NetBSD: patch-meson.build,v 1.16 2025/0
        foreach curses_libname : curses_libname_list
          libcurses = cc.find_library(curses_libname,
                                      required: false)
-@@ -1488,7 +1488,7 @@ if have_system and get_option('curses').
+@@ -1561,7 +1561,7 @@ if have_system and get_option('curses').
      endif
    endif
    if get_option('iconv').allowed()
@@ -25,16 +25,14 @@ $NetBSD: patch-meson.build,v 1.16 2025/0
        # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
        # We need to use libiconv if available because mixing libiconv's headers with
        # the system libc does not work.
-@@ -2318,9 +2318,9 @@ dbus_display = get_option('dbus_display'
+@@ -2353,8 +2353,8 @@ dbus_display = get_option('dbus_display'
    .allowed()
  
  have_virtfs = get_option('virtfs') \
--    .require(host_os == 'linux' or host_os == 'darwin',
--             error_message: 'virtio-9p (virtfs) requires Linux or macOS') \
--    .require(host_os == 'linux' or cc.has_function('pthread_fchdir_np'),
-+    .require(host_os == 'linux' or host_os == 'darwin' or host_os == 'netbsd',
-+             error_message: 'virtio-9p (virtfs) requires Linux, macOS, or NetBSD') \
-+    .require(host_os != 'darwin' or cc.has_function('pthread_fchdir_np'),
+-    .require(host_os == 'linux' or host_os == 'darwin' or host_os == 'freebsd',
+-             error_message: 'virtio-9p (virtfs) requires Linux or macOS or FreeBSD') \
++    .require(host_os == 'linux' or host_os == 'darwin' or host_os == 'freebsd' or host_os == 'netbsd',
++             error_message: 'virtio-9p (virtfs) requires Linux or macOS or FreeBSD or NetBSD') \
+     .require(host_os != 'darwin' or cc.has_function('pthread_fchdir_np'),
               error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \
-     .require(host_os == 'darwin' or libattr.found(),
-              error_message: 'virtio-9p (virtfs) on Linux requires libattr-devel') \
+     .require(host_os != 'linux' or libattr.found(),

Prev by Date: CVS commit: pkgsrc/net/libtrace
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/libtrace
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index