Received: by mail.netbsd.org (Postfix, from userid 605) id 5476184F4C; Tue, 30 Jan 2024 18:20:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 853A384D46 for ; Tue, 30 Jan 2024 18:20:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id KQrZsGYCWRTS for ; Tue, 30 Jan 2024 18:20:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B00F084CFD for ; Tue, 30 Jan 2024 18:20:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A8915FA42; Tue, 30 Jan 2024 18:20:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1706638809197350" MIME-Version: 1.0 Date: Tue, 30 Jan 2024 18:20:09 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/emulators/qemu To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20240130182009.A8915FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1706638809197350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Jan 30 18:20:09 UTC 2024 Modified Files: pkgsrc/emulators/qemu: Makefile distinfo pkgsrc/emulators/qemu/patches: patch-util_coroutine-ucontext.c Log Message: qemu: updated to 8.2.1 8.2.1 Bug fixes To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 pkgsrc/emulators/qemu/Makefile cvs rdiff -u -r1.213 -r1.214 pkgsrc/emulators/qemu/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1706638809197350 Content-Disposition: inline Content-Length: 4272 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/qemu/Makefile diff -u pkgsrc/emulators/qemu/Makefile:1.334 pkgsrc/emulators/qemu/Makefile:1.335 --- pkgsrc/emulators/qemu/Makefile:1.334 Tue Jan 30 14:21:48 2024 +++ pkgsrc/emulators/qemu/Makefile Tue Jan 30 18:20:09 2024 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.334 2024/01/30 14:21:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.335 2024/01/30 18:20:09 adam Exp $ -DISTNAME= qemu-8.2.0 -PKGREVISION= 1 +DISTNAME= qemu-8.2.1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/emulators/qemu/distinfo diff -u pkgsrc/emulators/qemu/distinfo:1.213 pkgsrc/emulators/qemu/distinfo:1.214 --- pkgsrc/emulators/qemu/distinfo:1.213 Thu Dec 28 17:15:39 2023 +++ pkgsrc/emulators/qemu/distinfo Tue Jan 30 18:20:09 2024 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.213 2023/12/28 17:15:39 adam Exp $ +$NetBSD: distinfo,v 1.214 2024/01/30 18:20:09 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-8.2.0.tar.xz) = 981f6034991b4f264f5733b00a56b3a0e5a42737aead00896f6c3a565efcd83b -SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c -Size (qemu-8.2.0.tar.xz) = 130008888 bytes +BLAKE2s (qemu-8.2.1.tar.xz) = cad2a7f6ed475148e73468b957ac6581b788e363d8561930bc4d9583273f8b41 +SHA512 (qemu-8.2.1.tar.xz) = e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af +Size (qemu-8.2.1.tar.xz) = 129848448 bytes SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853 @@ -21,5 +21,5 @@ SHA1 (patch-roms_u-boot-sam460ex_Makefil SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c -SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c +SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25 Index: pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c diff -u pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c:1.1 pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c:1.2 --- pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c:1.1 Wed Mar 15 11:49:20 2023 +++ pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c Tue Jan 30 18:20:09 2024 @@ -1,10 +1,10 @@ -$NetBSD: patch-util_coroutine-ucontext.c,v 1.1 2023/03/15 11:49:20 jperkin Exp $ +$NetBSD: patch-util_coroutine-ucontext.c,v 1.2 2024/01/30 18:20:09 adam Exp $ https://github.com/omniosorg/omnios-extra/blob/master/build/qemu/patches/0008-Temporary-coroutine-patch-pending-illumos-15206.patch ---- util/coroutine-ucontext.c.orig 2022-12-14 16:28:45.000000000 +0000 +--- util/coroutine-ucontext.c.orig 2024-01-29 19:13:22.000000000 +0000 +++ util/coroutine-ucontext.c -@@ -305,6 +305,12 @@ qemu_coroutine_switch(Coroutine *from_, +@@ -320,6 +320,12 @@ qemu_coroutine_switch(Coroutine *from_, ret = sigsetjmp(from->env, 0); if (ret == 0) { @@ -14,6 +14,6 @@ https://github.com/omniosorg/omnios-extr + ucontext_t *t = SIGJMP2UCONTEXT(to->env); + t->uc_mcontext.gregs[REG_FSBASE] = f->uc_mcontext.gregs[REG_FSBASE]; +#endif - start_switch_fiber_asan(action, &fake_stack_save, to->stack, - to->stack_size); - start_switch_fiber_tsan(&fake_stack_save, + start_switch_fiber_asan(IS_ENABLED(CONFIG_COROUTINE_POOL) || + action != COROUTINE_TERMINATE ? + &fake_stack_save : NULL, --_----------=_1706638809197350--