Re: UPDATE: QEMU 9.1.0

ping.

On 2024-10-02 10:06 p.m., Brad Smith wrote:
> Here is an update to QEMU 9.1.0.
>
>
> https://wiki.qemu.org/ChangeLog/9.1
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/Makefile,v
> retrieving revision 1.242
> diff -u -p -u -p -r1.242 Makefile
> --- Makefile 26 Jul 2024 11:49:01 -0000 1.242
> +++ Makefile 3 Oct 2024 02:03:36 -0000
> @@ -6,7 +6,7 @@ USE_NOBTCFI= Yes
> COMMENT-main= multi system emulator
> COMMENT-ga= QEMU guest agent
>
> -VERSION= 9.0.2
> +VERSION= 9.1.0
> DISTNAME= qemu-${VERSION}
> CATEGORIES= emulators
> SITES= https://download.qemu.org/
> @@ -70,8 +70,8 @@ LIB_DEPENDS-ga= ${LIB_DEPENDS}
> MAKE_ENV= V=1
> FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu
>
> -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
> -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
> +CFLAGS+= -I${LOCALBASE}/include
> +LDFLAGS+= -L${LOCALBASE}/lib
>
> # until the system headers are fixed properly.
> CFLAGS+= -Wno-redundant-decls
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/distinfo,v
> retrieving revision 1.75
> diff -u -p -u -p -r1.75 distinfo
> --- distinfo 26 Jul 2024 11:49:01 -0000 1.75
> +++ distinfo 3 Oct 2024 02:03:36 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qemu-9.0.2.tar.xz) = qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY=
> -SIZE (qemu-9.0.2.tar.xz) = 132387528
> +SHA256 (qemu-9.1.0.tar.xz) = gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ=
> +SIZE (qemu-9.1.0.tar.xz) = 132478356
> Index: patches/patch-contrib_plugins_Makefile
> ===================================================================
> RCS file: patches/patch-contrib_plugins_Makefile
> diff -N patches/patch-contrib_plugins_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-contrib_plugins_Makefile 3 Oct 2024 02:03:36 -0000
> @@ -0,0 +1,18 @@
> +- 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.13
> diff -u -p -u -p -r1.13 patch-meson_build
> --- patches/patch-meson_build 28 May 2024 13:57:37 -0000 1.13
> +++ patches/patch-meson_build 3 Oct 2024 02:03:36 -0000
> @@ -4,7 +4,7 @@
> Index: meson.build
> --- meson.build.orig
> +++ meson.build
> -@@ -2156,7 +2156,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
> +@@ -2253,7 +2253,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,7 +13,7 @@ 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'))
>
> -@@ -4226,9 +4226,6 @@ else
> +@@ -4293,9 +4293,6 @@ else
> summary_info += {'Objective-C compiler': false}
> endif
> option_cflags = (get_option('debug') ? ['-g'] : [])
> Index: patches/patch-qga_commands-bsd_c
> ===================================================================
> RCS file: patches/patch-qga_commands-bsd_c
> diff -N patches/patch-qga_commands-bsd_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-qga_commands-bsd_c 3 Oct 2024 02:03:36 -0000
> @@ -0,0 +1,307 @@
> +Adapted from https://github.com/aborche/qemu-guest-agent
> +
> +Adds support for "guest-get-fsinfo" and "guest-get-vcpus"
> +
> +Index: qga/commands-bsd.c
> +--- qga/commands-bsd.c.orig
> ++++ qga/commands-bsd.c
> +@@ -11,10 +11,9 @@
> + */
> +
> + #include "qemu/osdep.h"
> ++#include "qapi/error.h"
> + #include "qga-qapi-commands.h"
> + #include "qapi/qmp/qerror.h"
> +-#include "qapi/error.h"
> +-#include "qemu/queue.h"
> + #include "commands-common.h"
> + #include <sys/ioctl.h>
> + #include <sys/param.h>
> +@@ -28,6 +27,8 @@
> + #include <net/ethernet.h>
> +