Re: UPDATE: QEMU 9.0.1

On Sun, Jun 23, 2024 at 06:57:35AM -0400, Brad Smith wrote:
> On Sat, Jun 22, 2024 at 05:23:40AM -0400, Brad Smith wrote:
> > On Sun, Jun 16, 2024 at 07:38:59AM -0400, Brad Smith wrote:
> > > Here is an update to QEMU 9.0.1.
> > >
> > >
> > > https://marc.info/?l=qemu-devel&m=171808086221928&w=2
> >
> >
> > An updated diff rolling in a diff that should fix building on
> > powerpc/powerpc64 with an issue that popped up with 8.1 and
> > a hack to resolve an issue naddy@ ran into where the tests
> > will pull in gtk-vnc if it happens to exis, but then dpb
> > garbage collected it.
>
> third rev,
> I sent out the wrong diff and the meson buts weren't what I intended. I'm
> going to look at that separately.
>
> I also added cpuinfo bits for arm64.

and a fourth rev now that everything has been pushed upstream.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.240
diff -u -p -u -p -r1.240 Makefile
--- Makefile 28 May 2024 13:57:37 -0000 1.240
+++ Makefile 7 Jul 2024 04:53:10 -0000
@@ -6,7 +6,7 @@ USE_NOBTCFI= Yes
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent

-VERSION= 9.0.0
+VERSION= 9.0.1
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
SITES= https://download.qemu.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 distinfo
--- distinfo 28 May 2024 13:57:37 -0000 1.73
+++ distinfo 7 Jul 2024 04:53:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-9.0.0.tar.xz) = MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=
-SIZE (qemu-9.0.0.tar.xz) = 129789856
+SHA256 (qemu-9.0.1.tar.xz) = 0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU=
+SIZE (qemu-9.0.1.tar.xz) = 132368412
Index: patches/patch-tcg_riscv_tcg-target_c_inc
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-tcg_riscv_tcg-target_c_inc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-tcg_riscv_tcg-target_c_inc
--- patches/patch-tcg_riscv_tcg-target_c_inc 28 May 2024 13:57:37 -0000 1.2
+++ patches/patch-tcg_riscv_tcg-target_c_inc 7 Jul 2024 04:53:10 -0000
@@ -1,12 +1,21 @@
+util/cpuinfo-riscv: Support OpenBSD signal frame
+adc028428a6da5ea8d6a688085966a33be4c97c7
+
Index: tcg/riscv/tcg-target.c.inc
--- tcg/riscv/tcg-target.c.inc.orig
+++ tcg/riscv/tcg-target.c.inc
-@@ -2116,7 +2116,7 @@ static void sigill_handler(int signo, siginfo_t *si, v
+@@ -2116,7 +2116,14 @@ static void sigill_handler(int signo, siginfo_t *si, v
{
/* Skip the faulty instruction */
ucontext_t *uc = (ucontext_t *)data;
-- uc->uc_mcontext.__gregs[REG_PC] += 4;
++
++#ifdef __linux__
+ uc->uc_mcontext.__gregs[REG_PC] += 4;
++#elif defined(__OpenBSD__)
+ uc->sc_sepc += 4;
++#else
++# error Unsupported OS
++