pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: update to 7.1.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/7cada6d5ec74
branches: trunk
changeset: 385413:7cada6d5ec74
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Sep 17 09:54:56 2022 +0000
description:
qemu: update to 7.1.0
This release includes initial support for LoongArch64 as well as CPU
architecture and driver emulation improvements for ARM, HPPA, Nios2,
OpenRISC, PowerPC, Renesas, s390, x86 and Xtensa.
Incompatible changes
The -enable-fips option to QEMU system emulators has been removed
The -writeconfig option to QEMU system emulators has been removed
The deprecated x86 CPU model Icelake-Client has been removed
The deprecated properties loaded (for crypto objects) and opened
(for RNG backends) are now read-only
The deprecated -soundhw option has been replaced by -audio
(e.g. -audio pa,model=hda)
The deprecated -sdl and -curses have been removed, use -display sdl
and -display curses instead.
The -display sdl,window_close=... suboption has been removed, use
-display sdl,window-close=... instead, i.e. with a minus instead of an
underscore between “window” and “close”
The -alt-grab option and the -display sdl,alt_grab=on suboption have been
removed, use -display sdl,grab-mod=lshift-lctrl-lalt instead.
The -ctrl-grab option and the -display sdl,ctrl_grab=on suboption have
been removed, use -display sdl,grab-mod=rctrl instead.
The x86 Icelake-Client CPU does not exist in the real world and has
therefore been removed.
diffstat:
emulators/qemu/Makefile | 15 +---
emulators/qemu/PLIST | 13 +++-
emulators/qemu/distinfo | 13 +--
emulators/qemu/patches/patch-hw_core_uboot__image.h | 12 ---
emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c | 14 ++++
emulators/qemu/patches/patch-slirp_src_tcp__subr.c | 57 ------------------
emulators/qemu/patches/patch-target_i386_cpu.c | 10 +-
7 files changed, 40 insertions(+), 94 deletions(-)
diffs (278 lines):
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile Sat Sep 17 09:30:32 2022 +0000
+++ b/emulators/qemu/Makefile Sat Sep 17 09:54:56 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.302 2022/09/11 12:51:34 wiz Exp $
+# $NetBSD: Makefile,v 1.303 2022/09/17 09:54:56 tnn Exp $
-DISTNAME= qemu-7.0.0
-PKGREVISION= 4
+DISTNAME= qemu-7.1.0
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
@@ -26,15 +25,7 @@
TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=0.4.3:../../textproc/py-sphinx-rtd-theme
-
-SUBST_CLASSES+= sphinx-build
-SUBST_STAGE.sphinx-build= pre-configure
-SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build
-SUBST_FILES.sphinx-build+= configure
-SUBST_FILES.sphinx-build+= docs/meson.build
-SUBST_FILES.sphinx-build+= roms/skiboot/doc/Makefile
-SUBST_FILES.sphinx-build+= roms/u-boot/doc/Makefile
-SUBST_SED.sphinx-build+= -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
+CONFIGURE_ARGS+= --sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
.include "options.mk"
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/PLIST
--- a/emulators/qemu/PLIST Sat Sep 17 09:30:32 2022 +0000
+++ b/emulators/qemu/PLIST Sat Sep 17 09:54:56 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.81 2022/05/19 16:10:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.82 2022/09/17 09:54:56 tnn Exp $
bin/elf2dmp
${PLIST.aarch64}bin/qemu-aarch64
${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -46,6 +46,7 @@
bin/qemu-system-cris
bin/qemu-system-hppa
bin/qemu-system-i386
+bin/qemu-system-loongarch64
bin/qemu-system-m68k
bin/qemu-system-microblaze
bin/qemu-system-microblazeel
@@ -125,6 +126,7 @@
share/doc/qemu/devel/qgraph.html
share/doc/qemu/devel/qom.html
share/doc/qemu/devel/qtest.html
+share/doc/qemu/devel/replay.html
share/doc/qemu/devel/reset.html
share/doc/qemu/devel/s390-dasd-ipl.html
share/doc/qemu/devel/secure-coding-practices.html
@@ -140,6 +142,7 @@
share/doc/qemu/devel/trivial-patches.html
share/doc/qemu/devel/ui.html
share/doc/qemu/devel/vfio-migration.html
+share/doc/qemu/devel/virtio-backends.html
share/doc/qemu/devel/writing-monitor-commands.html
share/doc/qemu/genindex.html
share/doc/qemu/index.html
@@ -169,6 +172,7 @@
share/doc/qemu/specs/acpi_mem_hotplug.html
share/doc/qemu/specs/acpi_nvdimm.html
share/doc/qemu/specs/acpi_pci_hotplug.html
+share/doc/qemu/specs/fw_cfg.html
share/doc/qemu/specs/index.html
share/doc/qemu/specs/ppc-spapr-hcalls.html
share/doc/qemu/specs/ppc-spapr-hotplug.html
@@ -218,6 +222,9 @@
share/doc/qemu/system/cpu-hotplug.html
share/doc/qemu/system/device-emulation.html
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/ivshmem.html
share/doc/qemu/system/devices/net.html
share/doc/qemu/system/devices/nvme.html
@@ -230,6 +237,7 @@
share/doc/qemu/system/guest-loader.html
share/doc/qemu/system/i386/amd-memory-encryption.html
share/doc/qemu/system/i386/cpu.html
+share/doc/qemu/system/i386/hyperv.html
share/doc/qemu/system/i386/kvm-pv.html
share/doc/qemu/system/i386/microvm.html
share/doc/qemu/system/i386/pc.html
@@ -239,6 +247,7 @@
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/managed-startup.html
share/doc/qemu/system/monitor.html
share/doc/qemu/system/multi-process.html
@@ -254,6 +263,7 @@
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
share/doc/qemu/system/riscv/sifive_u.html
@@ -309,6 +319,7 @@
${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
${PLIST.gtk}share/locale/sv/LC_MESSAGES/qemu.mo
${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/uk/LC_MESSAGES/qemu.mo
${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
share/qemu/QEMU,cgthree.bin
share/qemu/QEMU,tcx.bin
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo Sat Sep 17 09:30:32 2022 +0000
+++ b/emulators/qemu/distinfo Sat Sep 17 09:54:56 2022 +0000
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.193 2022/06/12 13:49:28 leot Exp $
+$NetBSD: distinfo,v 1.194 2022/09/17 09:54:56 tnn 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.0.0.tar.xz) = 1d0df58230a436f476df87a7b315ab381743a24837314978f687986d4d0f2a16
-SHA512 (qemu-7.0.0.tar.xz) = 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
-Size (qemu-7.0.0.tar.xz) = 125117636 bytes
+BLAKE2s (qemu-7.1.0.tar.xz) = b441c04ebb4e1b79d8ce2c772c6f2cd65b741e1c24d1de59eb1391f84e50a2fe
+SHA512 (qemu-7.1.0.tar.xz) = c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
+Size (qemu-7.1.0.tar.xz) = 121833004 bytes
SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
-SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
+SHA1 (patch-hw_mips_mipssim__virtio.c) = 64e5b8c7a7628a71a3c8f267db882d96ba528941
SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
@@ -21,7 +21,6 @@
SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
-SHA1 (patch-slirp_src_tcp__subr.c) = bd6d80ecf3baeaf6f8458b2361bcb92298d41f7e
-SHA1 (patch-target_i386_cpu.c) = ec53954cbf0458d6974d87fa30951876ee0a6d3a
+SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
SHA1 (patch-target_i386_meson.build) = 0ef0636dd68e5eeb9a2a34473e2a24bf3c141c0f
SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/patches/patch-hw_core_uboot__image.h
--- a/emulators/qemu/patches/patch-hw_core_uboot__image.h Sat Sep 17 09:30:32 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-hw_core_uboot__image.h,v 1.2 2019/04/24 13:59:32 ryoon Exp $
-
---- hw/core/uboot_image.h.orig 2019-04-23 18:14:45.000000000 +0000
-+++ hw/core/uboot_image.h
-@@ -75,6 +75,7 @@
- #define IH_CPU_NIOS2 15 /* Nios-II */
- #define IH_CPU_BLACKFIN 16 /* Blackfin */
- #define IH_CPU_AVR32 17 /* AVR32 */
-+#define IH_CPU_ARM64 22 /* ARM64 */
-
- /*
- * Image Types
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-hw_mips_mipssim__virtio.c Sat Sep 17 09:54:56 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-hw_mips_mipssim__virtio.c,v 1.1 2022/09/17 09:54:56 tnn Exp $
+
+Fix build error. mipssim_virtio.c is removed in master.
+
+--- hw/mips/mipssim_virtio.c.orig 2022-09-07 17:53:18.000000000 +0000
++++ hw/mips/mipssim_virtio.c
+@@ -33,7 +33,6 @@
+
+ #include "qemu/osdep.h"
+ #include "qapi/error.h"
+-#include "qemu-common.h"
+ #include "cpu.h"
+ #include "hw/mips/mips.h"
+ #include "hw/mips/cpudevs.h"
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/patches/patch-slirp_src_tcp__subr.c
--- a/emulators/qemu/patches/patch-slirp_src_tcp__subr.c Sat Sep 17 09:30:32 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-slirp_src_tcp__subr.c,v 1.1 2021/09/19 13:49:12 yhardy Exp $
-
-Issues:
-
- QEMU crashes when receiving network connection on NetBSD
- https://gitlab.com/qemu-project/qemu/-/issues/605
-
- Use the exact sockaddr size in getnameinfo call
- https://gitlab.freedesktop.org/slirp/libslirp/-/issues/52
- Fixed in commit: 23db43ab
-
---- slirp/src/tcp_subr.c.orig 2021-09-18 20:05:43.313555017 +0000
-+++ slirp/src/tcp_subr.c
-@@ -464,7 +464,7 @@ void tcp_connect(struct socket *inso)
- Slirp *slirp = inso->slirp;
- struct socket *so;
- struct sockaddr_storage addr;
-- socklen_t addrlen = sizeof(struct sockaddr_storage);
-+ socklen_t addrlen;
- struct tcpcb *tp;
- int s, opt, ret;
- /* AF_INET6 addresses are bigger than AF_INET, so this is big enough. */
-@@ -473,7 +473,17 @@ void tcp_connect(struct socket *inso)
-
- DEBUG_CALL("tcp_connect");
- DEBUG_ARG("inso = %p", inso);
-- ret = getnameinfo((const struct sockaddr *) &inso->lhost.ss, sizeof(inso->lhost.ss), addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV);
-+ switch (inso->lhost.ss.ss_family) {
-+ case AF_INET:
-+ addrlen = sizeof(struct sockaddr_in);
-+ break;
-+ case AF_INET6:
-+ addrlen = sizeof(struct sockaddr_in6);
-+ break;
-+ default:
-+ g_assert_not_reached();
-+ }
-+ ret = getnameinfo((const struct sockaddr *) &inso->lhost.ss, addrlen, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV);
- g_assert(ret == 0);
- DEBUG_ARG("ip = [%s]:%s", addrstr, portstr);
- DEBUG_ARG("so_state = 0x%x", inso->so_state);
-@@ -494,6 +504,7 @@ void tcp_connect(struct socket *inso)
- * us again until the guest address is available.
- */
- DEBUG_MISC(" guest address not available yet");
-+ addrlen = sizeof(addr);
- s = accept(inso->s, (struct sockaddr *)&addr, &addrlen);
- if (s >= 0) {
- close(s);
-@@ -518,6 +529,7 @@ void tcp_connect(struct socket *inso)
-
- tcp_mss(sototcpcb(so), 0);
-
-+ addrlen = sizeof(addr);
- s = accept(inso->s, (struct sockaddr *)&addr, &addrlen);
- if (s < 0) {
- tcp_close(sototcpcb(so)); /* This will sofree() as well */
diff -r 86a72945533d -r 7cada6d5ec74 emulators/qemu/patches/patch-target_i386_cpu.c
--- a/emulators/qemu/patches/patch-target_i386_cpu.c Sat Sep 17 09:30:32 2022 +0000
+++ b/emulators/qemu/patches/patch-target_i386_cpu.c Sat Sep 17 09:54:56 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-target_i386_cpu.c,v 1.1 2022/06/12 13:49:28 leot Exp $
+$NetBSD: patch-target_i386_cpu.c,v 1.2 2022/09/17 09:54:56 tnn Exp $
Permit to use `-cpu host' with NVMM.
---- target/i386/cpu.c.orig 2022-04-19 19:10:27.000000000 +0000
+--- target/i386/cpu.c.orig 2022-08-30 16:41:57.000000000 +0000
+++ target/i386/cpu.c
@@ -26,6 +26,7 @@
#include "tcg/helper-tcg.h"
@@ -12,7 +12,7 @@
#include "kvm/kvm_i386.h"
#include "sev.h"
#include "qapi/error.h"
-@@ -1440,7 +1441,7 @@ static uint32_t xsave_area_size(uint64_t
+@@ -1486,7 +1487,7 @@ static uint32_t xsave_area_size(uint64_t
static inline bool accel_uses_host_cpuid(void)
{
@@ -20,8 +20,8 @@
+ return kvm_enabled() || hvf_enabled() || nvmm_enabled();
}
- static inline uint64_t x86_cpu_xsave_components(X86CPU *cpu)
-@@ -6418,7 +6419,8 @@ static void x86_cpu_realizefn(DeviceStat
+ static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
+@@ -6476,7 +6477,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);
Home |
Main Index |
Thread Index |
Old Index