CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 29 07:07:18 UTC 2026

Modified Files:
        pkgsrc/emulators/qemu: Makefile.common distinfo
        pkgsrc/emulators/qemu/patches: patch-hw_9pfs_9p.c

Log Message:
qemu: updated to 11.1.3

11.1.3
Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/qemu/Makefile.common
cvs rdiff -u -r1.257 -r1.258 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.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.common
diff -u pkgsrc/emulators/qemu/Makefile.common:1.4 pkgsrc/emulators/qemu/Makefile.common:1.5
--- pkgsrc/emulators/qemu/Makefile.common:1.4   Fri Oct 16 19:43:53 2026
+++ pkgsrc/emulators/qemu/Makefile.common       Thu Oct 29 07:07:18 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2026/10/16 19:43:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2026/10/29 07:07:18 adam Exp $
 # used by emulators/qemu/Makefile
 # used by sysutils/qemu-guest-agent/Makefile
 
-QEMU_VERSION?= 11.1.2
+QEMU_VERSION?= 11.1.3
 
 DISTNAME=      qemu-${QEMU_VERSION}
 MASTER_SITES=  https://download.qemu.org/

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.257 pkgsrc/emulators/qemu/distinfo:1.258
--- pkgsrc/emulators/qemu/distinfo:1.257        Wed Sep 30 07:18:39 2026
+++ pkgsrc/emulators/qemu/distinfo      Thu Oct 29 07:07:18 2026
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.257 2026/09/30 07:18:39 adam Exp $
+$NetBSD: distinfo,v 1.258 2026/10/29 07:07:18 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-11.1.2.tar.xz) = 4c63e47fed95b8391ec24674b9f0af3eb72fd71b2a1f7e0a2c02ef2ec1fbefd3
-SHA512 (qemu-11.1.2.tar.xz) = 6e32ebc1adfb5223488fa760a32f900a24a121b3b0637de561f55e3852f3f6fb47ba6e4776320924990d9cebd33d2908f520f017703c4f438dfa528dcb714600
-Size (qemu-11.1.2.tar.xz) = 141815216 bytes
+BLAKE2s (qemu-11.1.3.tar.xz) = 6111133e99a0e0e02609c693eb634c9dc448e0ce559dc775d38f9e28c0e77835
+SHA512 (qemu-11.1.3.tar.xz) = 6bcade0af849e6a7f124e2b07d07e8a6e1fd160dcdc7f3c9c968cbdbc8922b2ddfa68493105ac14516f8eea83db6ef4dba07cc6776a61aa023508b31e53b9ef7
+Size (qemu-11.1.3.tar.xz) = 141819712 bytes
 SHA1 (patch-fsdev_file-op-9p.h) = 1cf9f8602dca42b82f3d10e67c9bcd6aa971c7cc
 SHA1 (patch-fsdev_meson.build) = 15588c37dd4f6cc5064b8a163f814cee75b7246f
 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.c) = b1d5a75abeadb169c62e7983c655ac1ea87ed560
 SHA1 (patch-hw_9pfs_9p.h) = 4e2749619d2154f9fb341047aa278371b298e8a4
 SHA1 (patch-hw_9pfs_codir.c) = c065762ee13fdeaef063632f56d9d0ead6b68f61
 SHA1 (patch-hw_9pfs_meson.build) = 0fb98920bd0678c00c035dc1178edab526ecbc19

Index: pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.2 pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.3
--- pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c:1.2        Mon Jan  5 10:11:38 2026
+++ pkgsrc/emulators/qemu/patches/patch-hw_9pfs_9p.c    Thu Oct 29 07:07:18 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_9pfs_9p.c,v 1.2 2026/01/05 10:11:38 adam Exp $
+$NetBSD: patch-hw_9pfs_9p.c,v 1.3 2026/10/29 07:07:18 adam Exp $
 
 Add BSD support for fsdev 9p.
 
---- hw/9pfs/9p.c.orig  2025-12-23 19:48:56.000000000 +0000
+--- hw/9pfs/9p.c.orig  2026-10-28 19:57:39.000000000 +0000
 +++ hw/9pfs/9p.c
-@@ -136,7 +136,7 @@ static int dotl_to_open_flags(int flags)
+@@ -138,7 +138,7 @@ static int dotl_to_open_flags(int flags)
          { P9_DOTL_NONBLOCK, O_NONBLOCK } ,
          { P9_DOTL_DSYNC, O_DSYNC },
          { P9_DOTL_FASYNC, FASYNC },
@@ -13,7 +13,7 @@ Add BSD support for fsdev 9p.
          { P9_DOTL_NOATIME, O_NOATIME },
  #endif
  #ifndef CONFIG_DARWIN
-@@ -2365,6 +2365,13 @@ static int coroutine_fn v9fs_do_readdir_
+@@ -2451,7 +2451,15 @@ static int coroutine_fn v9fs_do_readdir_
          if (err || !dent) {
              break;
          }
@@ -23,23 +23,25 @@ Add BSD support for fsdev 9p.
 +            err = next_dir_pos;
 +            break;
 +        }
++#else
+         current_dir_pos = qemu_dirent_off(dent);
 +#endif
          err = v9fs_co_name_to_path(pdu, &fidp->path, dent->d_name, &path);
          if (err < 0) {
              break;
-@@ -2401,7 +2408,11 @@ static int coroutine_fn v9fs_do_readdir_
+@@ -2484,7 +2492,11 @@ static int coroutine_fn v9fs_do_readdir_
          count += len;
          v9fs_stat_free(&v9stat);
          v9fs_path_free(&path);
 +#if !defined(CONFIG_LINUX) && !defined(CONFIG_DARWIN)
 +        saved_dir_pos = next_dir_pos;
 +#else
-         saved_dir_pos = qemu_dirent_off(dent);
+         saved_dir_pos = current_dir_pos;
 +#endif
      }
  
-     v9fs_readdir_unlock(&fidp->fs.dir);
-@@ -2602,7 +2613,11 @@ static int coroutine_fn v9fs_do_readdir(
+     v9fs_path_free(&path);
+@@ -2690,7 +2702,11 @@ static int coroutine_fn v9fs_do_readdir(
              qid.version = 0;
          }
  
@@ -51,7 +53,7 @@ Add BSD support for fsdev 9p.
          v9fs_string_init(&name);
          v9fs_string_sprintf(&name, "%s", dent->d_name);
  
-@@ -3647,7 +3662,11 @@ static int v9fs_fill_statfs(V9fsState *s
+@@ -3763,7 +3779,11 @@ v9fs_fill_statfs(V9fsState *s, V9fsPDU *
      if (!bsize_factor) {
          bsize_factor = 1;
      }
@@ -63,7 +65,7 @@ Add BSD support for fsdev 9p.
      f_bsize = stbuf->f_bsize;
      f_bsize *= bsize_factor;
      /*
-@@ -3664,10 +3683,14 @@ static int v9fs_fill_statfs(V9fsState *s
+@@ -3780,10 +3800,14 @@ v9fs_fill_statfs(V9fsState *s, V9fsPDU *
      fsid_val = (unsigned int)stbuf->f_fsid.val[0] |
                 (unsigned long long)stbuf->f_fsid.val[1] << 32;
      f_namelen = NAME_MAX;
@@ -79,7 +81,7 @@ Add BSD support for fsdev 9p.
  #endif
  
      return pdu_marshal(pdu, offset, "ddqqqqqqd",
-@@ -4038,7 +4061,7 @@ out_nofid:
+@@ -4170,7 +4194,7 @@ out_nofid:
      v9fs_string_free(&name);
  }