CVS commit: pkgsrc/emulators/qemu

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/qemu
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Sat, 6 May 2023 19:22:37 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat May  6 19:22:37 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/qemu/patches: patch-target_arm_translate-sve.c
            patch-target_sparc_translate.c
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-backends_tpm_tpm__ioctl.h
            patch-linux-user_syscall.c

Log Message:
qemu: Update to 8.0.0

* Add libusb1 dependency unconditionally.
* Add graphics/SDL2_image for sdl option.

Changelog:
8.0.0
Highlights include:

  * ARM: emulation support for FEAT_EVT, FEAT_FGT, and AArch32 ARMv8-R
  * ARM: CPU emulation for Cortex-A55 and Cortex-R52, and new Olimex STM32 H405
    machine type
  * ARM: gdbstub support for M-profile system registers
  * HPPA: fid (Floating-Point Identify) instruction support and 32-bit
    emulation improvements
  * RISC-V: additional ISA and Extension support for smstateen, native debug
    icount trigger, cache-related PMU events in virtual mode, Zawrs/Svadu/
    T-Head/Zicond extensions, and ACPI support
  * RISC-V: updated machine support for OpenTitan, PolarFire, and OpenSBI
  * RISC-V: wide ranges of fixes covering PMP propagation for TLB, mret
    exceptions, uncompressed instructions, and other emulation/virtualization
    improvements
  * s390x: improved zPCI passthrough device handling
  * s390x: support for asynchronous teardown of memory of secure KVM guests
    during reboot
  * x86: support for Xen guests under KVM with Linux v5.12+
  * x86: new SapphireRapids CPU model
  * x86: TCG support for FSRM, FZRM, FSRS, and FSRC CPUID flags
  * virtio-mem: support for using preallocation in conjunction with live
    migration
  * VFIO: experimental migration support updated to v2 VFIO migration protocol
  * qemu-nbd: improved efficient over TCP and when using TLS
  * and lots more...


To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.201 -r1.202 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/qemu/options.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/qemu/patches/patch-linux-user_syscall.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c \
    pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.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.314 pkgsrc/emulators/qemu/Makefile:1.315
--- pkgsrc/emulators/qemu/Makefile:1.314        Sat May  6 19:09:14 2023
+++ pkgsrc/emulators/qemu/Makefile      Sat May  6 19:22:37 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.314 2023/05/06 19:09:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.315 2023/05/06 19:22:37 ryoon Exp $
 
-DISTNAME=      qemu-7.2.1
-PKGREVISION=   1
+DISTNAME=      qemu-8.0.0
+PKGNAME=       ${DISTNAME:S/-rc/rc/}
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -25,7 +25,7 @@ GCC_REQD+=            7
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-rtd-theme>=0.4.3:../../textproc/py-sphinx-rtd-theme
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
 CONFIGURE_ARGS+=       --sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 
 .include "options.mk"
@@ -115,6 +115,7 @@ UE_ARCHS+=          s390x sh4 sh4eb sparc sparc3
 UE_ARCHS+=             x86_64 xtensa xtensaeb
 
 .if ${OPSYS} == "NetBSD"
+PLIST.ga=                      yes
 PLIST.nbd=                     yes
 .  if !exists(/usr/include/machine/trap.h)     \
        || "1"=="1"     # XXX usermode emulation is broken
@@ -125,6 +126,7 @@ USER_EMUL=                  i386 x86_64
 .  endif
 .elif ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
 USER_EMUL=                     i386 x86_64
+PLIST.ga=                      yes
 PLIST.nbd=                     yes
 .elif ${OPSYS} == "Darwin"
 USER_EMUL=
@@ -193,6 +195,7 @@ post-install:
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.84 pkgsrc/emulators/qemu/PLIST:1.85
--- pkgsrc/emulators/qemu/PLIST:1.84    Fri Jan 20 08:36:24 2023
+++ pkgsrc/emulators/qemu/PLIST Sat May  6 19:22:37 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2023/01/20 08:36:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.85 2023/05/06 19:22:37 ryoon Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -94,6 +94,7 @@ share/doc/qemu/.buildinfo
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/about/build-platforms.html
 share/doc/qemu/about/deprecated.html
+share/doc/qemu/about/emulation.html
 share/doc/qemu/about/index.html
 share/doc/qemu/about/license.html
 share/doc/qemu/about/removed-features.html
@@ -138,6 +139,7 @@ share/doc/qemu/devel/style.html
 share/doc/qemu/devel/submitting-a-patch.html
 share/doc/qemu/devel/submitting-a-pull-request.html
 share/doc/qemu/devel/tcg-icount.html
+share/doc/qemu/devel/tcg-ops.html
 share/doc/qemu/devel/tcg-plugins.html
 share/doc/qemu/devel/tcg.html
 share/doc/qemu/devel/testing.html
@@ -165,6 +167,7 @@ share/doc/qemu/interop/vhost-user-gpu.ht
 share/doc/qemu/interop/vhost-user.html
 share/doc/qemu/interop/vhost-vdpa.html
 share/doc/qemu/interop/virtio-balloon-stats.html
+share/doc/qemu/interop/vnc-ledstate-pseudo-encoding.html
 share/doc/qemu/objects.inv
 share/doc/qemu/search.html
 share/doc/qemu/searchindex.js
@@ -228,6 +231,7 @@ share/doc/qemu/system/devices/can.html
 share/doc/qemu/system/devices/canokey.html
 share/doc/qemu/system/devices/ccid.html
 share/doc/qemu/system/devices/cxl.html
+share/doc/qemu/system/devices/igb.html
 share/doc/qemu/system/devices/ivshmem.html
 share/doc/qemu/system/devices/net.html
 share/doc/qemu/system/devices/nvme.html
@@ -245,12 +249,14 @@ share/doc/qemu/system/i386/kvm-pv.html
 share/doc/qemu/system/i386/microvm.html
 share/doc/qemu/system/i386/pc.html
 share/doc/qemu/system/i386/sgx.html
+share/doc/qemu/system/i386/xen.html
 share/doc/qemu/system/images.html
 share/doc/qemu/system/index.html
+share/doc/qemu/system/introduction.html
 share/doc/qemu/system/invocation.html
 share/doc/qemu/system/keys.html
 share/doc/qemu/system/linuxboot.html
-share/doc/qemu/system/loongarch/loongson3.html
+share/doc/qemu/system/loongarch/virt.html
 share/doc/qemu/system/managed-startup.html
 share/doc/qemu/system/monitor.html
 share/doc/qemu/system/multi-process.html
@@ -269,7 +275,6 @@ share/doc/qemu/system/pr-manager.html
 share/doc/qemu/system/qemu-block-drivers.html
 share/doc/qemu/system/qemu-cpu-models.html
 share/doc/qemu/system/qemu-manpage.html
-share/doc/qemu/system/quickstart.html
 share/doc/qemu/system/replay.html
 share/doc/qemu/system/riscv/microchip-icicle-kit.html
 share/doc/qemu/system/riscv/shakti-c.html
@@ -278,6 +283,7 @@ share/doc/qemu/system/riscv/virt.html
 share/doc/qemu/system/s390x/3270.html
 share/doc/qemu/system/s390x/bootdevices.html
 share/doc/qemu/system/s390x/css.html
+share/doc/qemu/system/s390x/pcidevices.html
 share/doc/qemu/system/s390x/protvirt.html
 share/doc/qemu/system/s390x/vfio-ap.html
 share/doc/qemu/system/s390x/vfio-ccw.html
@@ -307,7 +313,6 @@ share/doc/qemu/tools/qemu-pr-helper.html
 share/doc/qemu/tools/qemu-storage-daemon.html
 share/doc/qemu/tools/qemu-trace-stap.html
 share/doc/qemu/tools/virtfs-proxy-helper.html
-share/doc/qemu/tools/virtiofsd.html
 share/doc/qemu/user/index.html
 share/doc/qemu/user/main.html
 share/icons/hicolor/128x128/apps/qemu.png
@@ -420,7 +425,6 @@ share/qemu/qemu-nsis.bmp
 share/qemu/qemu_vga.ndrv
 share/qemu/s390-ccw.img
 share/qemu/s390-netboot.img
-share/qemu/sgabios.bin
 share/qemu/skiboot.lid
 share/qemu/slof.bin
 share/qemu/trace-events-all

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.201 pkgsrc/emulators/qemu/distinfo:1.202
--- pkgsrc/emulators/qemu/distinfo:1.201        Fri May  5 07:49:29 2023
+++ pkgsrc/emulators/qemu/distinfo      Sat May  6 19:22:37 2023
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.201 2023/05/05 07:49:29 adam Exp $
+$NetBSD: distinfo,v 1.202 2023/05/06 19:22:37 ryoon 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-7.2.1.tar.xz) = afeee97e296681df36b0929289ee2bdd89cf27d214a696dec9c5936c697f7d2b
-SHA512 (qemu-7.2.1.tar.xz) = e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
-Size (qemu-7.2.1.tar.xz) = 122400592 bytes
+BLAKE2s (qemu-8.0.0.tar.xz) = 9f47afef0e23e47e402c2857b98e3c5efa56948f9424c14cbc4c9b660ea86e06
+SHA512 (qemu-8.0.0.tar.xz) = 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+Size (qemu-8.0.0.tar.xz) = 127835148 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
-SHA1 (patch-backends_tpm_tpm__ioctl.h) = 5e18e0c9d0581386e0100a566694b3e631618585
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
 SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
@@ -17,13 +16,12 @@ SHA1 (patch-hw_net_xilinx__axienet.c) = 
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
-SHA1 (patch-linux-user_syscall.c) = eff87b18437340e63dfe0b8914fb6bc6ef2f59e0
 SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
 SHA1 (patch-meson_mesonbuild_linkers_linkers.py) = 842b01f543c99c66630df8450f71ab9fc422ff32
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
-SHA1 (patch-target_arm_translate-sve.c) = f5909d20ea6f04bbc4a0d61d79f795bac24d6d86
+SHA1 (patch-target_arm_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
 SHA1 (patch-target_i386_meson.build) = 0ef0636dd68e5eeb9a2a34473e2a24bf3c141c0f
-SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76
+SHA1 (patch-target_sparc_translate.c) = f633b3953847c1a7e93f1d09a67964431979b197
 SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.19 pkgsrc/emulators/qemu/options.mk:1.20
--- pkgsrc/emulators/qemu/options.mk:1.19       Tue Feb 14 00:35:56 2023
+++ pkgsrc/emulators/qemu/options.mk    Sat May  6 19:22:37 2023
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2023/02/14 00:35:56 tnn Exp $
+# $NetBSD: options.mk,v 1.20 2023/05/06 19:22:37 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
-PKG_SUPPORTED_OPTIONS+=        jemalloc
 PKG_SUGGESTED_OPTIONS+=        iscsi spice
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -23,10 +22,6 @@ PKG_SUGGESTED_OPTIONS+=      sdl
 .  endif
 .endif
 
-.if ${OPSYS} != "SunOS"
-PKG_SUGGESTED_OPTIONS+=        jemalloc
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=           gtk keymap virtfs-proxy-helper
@@ -63,6 +58,7 @@ CONFIGURE_ARGS+=      --disable-opengl
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=       --enable-sdl
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-sdl
 .endif
@@ -103,8 +99,3 @@ CONFIGURE_ARGS+=     --enable-libiscsi
 .else
 CONFIGURE_ARGS+=       --disable-libiscsi
 .endif
-
-.if !empty(PKG_OPTIONS:Mjemalloc)
-CONFIGURE_ARGS+=       --enable-jemalloc
-.include "../../devel/jemalloc/buildlink3.mk"
-.endif

Index: pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c:1.1 pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c:1.1  Tue Oct 25 18:46:08 2022
+++ pkgsrc/emulators/qemu/patches/patch-target_arm_translate-sve.c      Sat May  6 19:22:37 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-target_arm_translate-sve.c,v 1.1 2022/10/25 18:46:08 jperkin Exp $
+$NetBSD: patch-target_arm_translate-sve.c,v 1.2 2023/05/06 19:22:37 ryoon Exp $
 
 Avoid FSCALE define, notably on SunOS.
 
---- target/arm/translate-sve.c.orig    2022-08-30 16:41:57.000000000 +0000
-+++ target/arm/translate-sve.c
+--- target/arm/tcg/translate-sve.c.orig        2022-08-30 16:41:57.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)
Index: pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.c:1.1 pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.c:1.1    Mon Nov  2 17:17:15 2020
+++ pkgsrc/emulators/qemu/patches/patch-target_sparc_translate.c        Sat May  6 19:22:37 2023
@@ -1,24 +1,24 @@
-$NetBSD: patch-target_sparc_translate.c,v 1.1 2020/11/02 17:17:15 martin Exp $
+$NetBSD: patch-target_sparc_translate.c,v 1.2 2023/05/06 19:22:37 ryoon Exp $
 
 Patch from upstream (not integrated there yet) to work around %pc/%npc
 being set to invalid values via ptrace, triggered by the NetBSD ptrace
 ATF tests. Real hardware seems to hardcode the lower bits to zero too.
 
---- target/sparc/translate.c.orig      2020-08-11 21:17:15.000000000 +0200
-+++ target/sparc/translate.c   2020-11-02 18:04:50.507211101 +0100
-@@ -4525,6 +4525,7 @@
+--- target/sparc/translate.c.orig      2023-03-28 20:31:55.000000000 +0000
++++ target/sparc/translate.c
+@@ -4324,6 +4324,7 @@ static void disas_sparc_insn(DisasContex
  
                                      r_tsptr = tcg_temp_new_ptr();
                                      gen_load_trap_state_at_tl(r_tsptr, cpu_env);
 +                                    tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
                                      tcg_gen_st_tl(cpu_tmp0, r_tsptr,
                                                    offsetof(trap_state, tpc));
-                                     tcg_temp_free_ptr(r_tsptr);
-@@ -4536,6 +4537,7 @@
+                                 }
+@@ -4334,6 +4335,7 @@ static void disas_sparc_insn(DisasContex
  
                                      r_tsptr = tcg_temp_new_ptr();
                                      gen_load_trap_state_at_tl(r_tsptr, cpu_env);
 +                                    tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
                                      tcg_gen_st_tl(cpu_tmp0, r_tsptr,
                                                    offsetof(trap_state, tnpc));
-                                     tcg_temp_free_ptr(r_tsptr);
+                                 }

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

Home | Main Index | Thread Index | Old Index