Re: UPDATE: QEMU 9.2.0

On Wed, Dec 11, 2024 at 08:50:29PM -0500, Brad Smith wrote:
> Here is an update to QEMU 9.2.0.
>
>
> https://wiki.qemu.org/ChangeLog/9.2

Updated diff removing retguard workaround.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.245
diff -u -p -u -p -r1.245 Makefile
--- Makefile 21 Dec 2024 11:37:57 -0000 1.245
+++ Makefile 26 Dec 2024 12:21:35 -0000
@@ -6,7 +6,7 @@ USE_NOBTCFI= Yes
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent

-VERSION= 9.1.2
+VERSION= 9.2.0
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
SITES= https://download.qemu.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 distinfo
--- distinfo 4 Dec 2024 13:13:18 -0000 1.77
+++ distinfo 26 Dec 2024 12:21:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-9.1.2.tar.xz) = Gf2ddTWlTW4EThhkAqo7OxvfqHw5LsiISFVZLIUQyW8=
-SIZE (qemu-9.1.2.tar.xz) = 132481332
+SHA256 (qemu-9.2.0.tar.xz) = +FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ=
+SIZE (qemu-9.2.0.tar.xz) = 135188800
Index: patches/patch-contrib_plugins_Makefile
===================================================================
RCS file: patches/patch-contrib_plugins_Makefile
diff -N patches/patch-contrib_plugins_Makefile
--- patches/patch-contrib_plugins_Makefile 29 Oct 2024 12:28:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-- contrib/plugins: ensure build does not pick up a system copy of plugin header
-
-Index: contrib/plugins/Makefile
---- contrib/plugins/Makefile.orig
-+++ contrib/plugins/Makefile
-@@ -41,9 +41,10 @@ SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(
-
- # The main QEMU uses Glib extensively so it is perfectly fine to use it
- # in plugins (which many example do).
--PLUGIN_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0)
--PLUGIN_CFLAGS += -fPIC -Wall
-+GLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0)
- PLUGIN_CFLAGS += -I$(TOP_SRC_PATH)/include/qemu
-+PLUGIN_CFLAGS += $(GLIB_CFLAGS)
-+PLUGIN_CFLAGS += -fPIC -Wall
-
- # Helper that honours V=1 so we get some output when compiling
- quiet-@ = $(if $(V),,@$(if $1,printf " %-7s %s\n" "$(strip $1)" "$(strip $2)" && ))
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-meson_build,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-meson_build
--- patches/patch-meson_build 4 Dec 2024 13:13:18 -0000 1.15
+++ patches/patch-meson_build 26 Dec 2024 12:21:35 -0000
@@ -1,10 +1,21 @@
+- revert retguard bug workaround
- localstatedir does not belong under prefix
- Remove hardcoding of optimization

Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -2265,7 +2265,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
+@@ -673,8 +673,7 @@ hardening_flags = [
+ #
+ # NB2: This clashes with the "retguard" extension of OpenBSD's Clang
+ # https://gitlab.com/qemu-project/qemu/-/issues/2278
+-if host_os != 'openbsd' and \
+- cc.compiles('extern struct { void (*cb)(void); } s; void f(void) { s.cb(); }',
++if cc.compiles('extern struct { void (*cb)(void); } s; void f(void) { s.cb(); }',
+ name: '-fzero-call-used-regs=used-gpr',
+ args: ['-O2', '-fzero-call-used-regs=used-gpr'])
+ hardening_flags += '-fzero-call-used-regs=used-gpr'
+@@ -2376,7 +2375,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
@@ -13,8 +24,8 @@ Index: meson.build
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))

-@@ -4306,9 +4306,6 @@ else
- summary_info += {'Objective-C compiler': false}
+@@ -4561,9 +4560,6 @@ if have_rust
+ summary_info += {'bindgen version': bindgen.version()}
endif
option_cflags = (get_option('debug') ? ['-g'] : [])
-if get_option('optimization') != 'plain'
Index: patches/patch-qga_commands-bsd_c
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-qga_commands-bsd_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-qga_commands-bsd_c
--- patches/patch-qga_commands-bsd_c 29 Oct 2024 12:28:54 -0000 1.3
+++ patches/patch-qga_commands-bsd_c 26 Dec 2024 12:21:35 -0000
@@ -5,19 +5,18 @@ Adds support for "guest-get-fsinfo" and
Index: qga/commands-bsd.c
--- qga/commands-bsd.c.orig
+++ qga/commands-bsd.c
-@@ -11,10 +11,9 @@
+@@ -11,9 +11,8 @@
*/

#include "qemu/osdep.h"
-+#include "qapi/error.h"
- #include "qga-qapi-commands.h"
- #include "qapi/qmp/qerror.h"
--#include "qapi/error.h"
+-#include "qga-qapi-commands.h"
+ #include "qapi/error.h"
-#include "qemu/queue.h"
++#include "qga-qapi-commands.h"
#include "commands-common.h"
#include <sys/ioctl.h>
#include <sys/param.h>
-@@ -28,6 +27,8 @@
+@@ -27,6 +26,8 @@
#include <net/ethernet.h>