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>
#endif
#include <paths.h>
@@ -26,7 +25,7 @@ Index: qga/commands-bsd.c
#if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM)
bool build_fs_mount_list(FsMountList *mounts, Error **errp)
-@@ -179,3 +180,278 @@ bool guest_get_hw_addr(struct ifaddrs *ifa, unsigned c
+@@ -178,3 +179,278 @@ bool guest_get_hw_addr(struct ifaddrs *ifa, unsigned c
return true;
}
#endif /* HAVE_GETIFADDRS */
Index: patches/patch-qga_qapi-schema_json
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-qga_qapi-schema_json,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-qga_qapi-schema_json
--- patches/patch-qga_qapi-schema_json 29 Oct 2024 12:28:54 -0000 1.1
+++ patches/patch-qga_qapi-schema_json 26 Dec 2024 12:21:35 -0000
@@ -5,7 +5,7 @@ Adds support for "guest-get-fsinfo" and
Index: qga/qapi-schema.json
--- qga/qapi-schema.json.orig
+++ qga/qapi-schema.json
-@@ -767,7 +767,7 @@
+@@ -758,7 +758,7 @@
'data': {'logical-id': 'int',
'online': 'bool',
'*can-offline': 'bool'},
@@ -14,7 +14,7 @@ Index: qga/qapi-schema.json
##
# @guest-get-vcpus:
-@@ -783,7 +783,7 @@
+@@ -774,7 +774,7 @@
##
{ 'command': 'guest-get-vcpus',
'returns': ['GuestLogicalProcessor'],
@@ -23,7 +23,7 @@ Index: qga/qapi-schema.json
##
# @guest-set-vcpus:
-@@ -879,7 +879,7 @@
+@@ -870,7 +870,7 @@
'data': [ 'ide', 'fdc', 'scsi', 'virtio', 'xen', 'usb', 'uml', 'sata',
'sd', 'unknown', 'ieee1394', 'ssa', 'fibre', 'raid', 'iscsi',
'sas', 'mmc', 'virtual', 'file-backed-virtual', 'nvme' ],
@@ -32,7 +32,7 @@ Index: qga/qapi-schema.json
##
-@@ -898,7 +898,7 @@
+@@ -889,7 +889,7 @@
{ 'struct': 'GuestPCIAddress',
'data': {'domain': 'int', 'bus': 'int',
'slot': 'int', 'function': 'int'},
@@ -41,7 +41,7 @@ Index: qga/qapi-schema.json
##
# @GuestCCWAddress:
-@@ -918,7 +918,7 @@
+@@ -909,7 +909,7 @@
'ssid': 'int',
'subchno': 'int',
'devno': 'int'},
@@ -50,7 +50,7 @@ Index: qga/qapi-schema.json
##
# @GuestDiskAddress:
-@@ -948,7 +948,7 @@
+@@ -939,7 +939,7 @@
'bus': 'int', 'target': 'int', 'unit': 'int',
'*serial': 'str', '*dev': 'str',
'*ccw-address': 'GuestCCWAddress'},
@@ -59,7 +59,7 @@ Index: qga/qapi-schema.json
##
# @GuestNVMeSmart:
-@@ -1068,7 +1068,7 @@
+@@ -1059,7 +1059,7 @@
'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str',
'*used-bytes': 'uint64', '*total-bytes': 'uint64',
'*total-bytes-privileged': 'uint64', 'disk':
['GuestDiskAddress']},
@@ -68,7 +68,7 @@ Index: qga/qapi-schema.json
##
# @guest-get-fsinfo:
-@@ -1082,7 +1082,7 @@
+@@ -1073,7 +1073,7 @@
##
{ 'command': 'guest-get-fsinfo',
'returns': ['GuestFilesystemInfo'],
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/qemu/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 29 Oct 2024 12:28:54 -0000 1.18
+++ pkg/PLIST-main 26 Dec 2024 12:21:35 -0000
@@ -10,7 +10,6 @@
@bin bin/qemu-system-alpha
@bin bin/qemu-system-arm
@bin bin/qemu-system-avr
-@bin bin/qemu-system-cris
@bin bin/qemu-system-hppa
@bin bin/qemu-system-i386
@bin bin/qemu-system-loongarch64
@@ -99,12 +98,10 @@ share/doc/qemu/about/license.html
share/doc/qemu/about/removed-features.html
share/doc/qemu/dbus-dbusindex.html
share/doc/qemu/devel/
-share/doc/qemu/devel/acpi-bits.html
share/doc/qemu/devel/atomics.html
share/doc/qemu/devel/bitops.html
share/doc/qemu/devel/block-coroutine-wrapper.html
share/doc/qemu/devel/build-system.html
-share/doc/qemu/devel/ci.html
share/doc/qemu/devel/clocks.html
share/doc/qemu/devel/code-of-conduct.html
share/doc/qemu/devel/conflict-resolution.html
@@ -113,7 +110,6 @@ share/doc/qemu/devel/crypto.html
share/doc/qemu/devel/decodetree.html
share/doc/qemu/devel/docs.html
share/doc/qemu/devel/ebpf_rss.html
-share/doc/qemu/devel/fuzzing.html
share/doc/qemu/devel/index-api.html
share/doc/qemu/devel/index-build.html
share/doc/qemu/devel/index-internals.html
@@ -122,6 +118,7 @@ share/doc/qemu/devel/index-tcg.html
share/doc/qemu/devel/index.html
share/doc/qemu/devel/kconfig.html
share/doc/qemu/devel/loads-stores.html
+share/doc/qemu/devel/lockcnt.html
share/doc/qemu/devel/luks-detached-header.html
share/doc/qemu/devel/maintainers.html
share/doc/qemu/devel/memory.html
@@ -135,6 +132,7 @@ share/doc/qemu/devel/migration/index.htm
share/doc/qemu/devel/migration/main.html
share/doc/qemu/devel/migration/mapped-ram.html
share/doc/qemu/devel/migration/postcopy.html
+share/doc/qemu/devel/migration/qatzip-compression.html
share/doc/qemu/devel/migration/qpl-compression.html
share/doc/qemu/devel/migration/uadk-compression.html
share/doc/qemu/devel/migration/vfio.html
@@ -142,13 +140,13 @@ share/doc/qemu/devel/migration/virtio.ht
share/doc/qemu/devel/modules.html
share/doc/qemu/devel/multi-process.html
share/doc/qemu/devel/multi-thread-tcg.html
+share/doc/qemu/devel/multiple-iothreads.html
share/doc/qemu/devel/pci.html
share/doc/qemu/devel/qapi-code-gen.html
share/doc/qemu/devel/qdev-api.html
-share/doc/qemu/devel/qgraph.html
share/doc/qemu/devel/qom-api.html
share/doc/qemu/devel/qom.html
-share/doc/qemu/devel/qtest.html
+share/doc/qemu/devel/rcu.html
share/doc/qemu/devel/replay.html
share/doc/qemu/devel/reset.html
share/doc/qemu/devel/s390-cpu-topology.html
@@ -162,7 +160,18 @@ share/doc/qemu/devel/tcg-icount.html
share/doc/qemu/devel/tcg-ops.html
share/doc/qemu/devel/tcg-plugins.html
share/doc/qemu/devel/tcg.html
-share/doc/qemu/devel/testing.html
+share/doc/qemu/devel/testing/
+share/doc/qemu/devel/testing/acpi-bits.html
+share/doc/qemu/devel/testing/avocado.html
+share/doc/qemu/devel/testing/blkdebug.html
+share/doc/qemu/devel/testing/blkverify.html
+share/doc/qemu/devel/testing/ci.html
+share/doc/qemu/devel/testing/functional.html
+share/doc/qemu/devel/testing/fuzzing.html
+share/doc/qemu/devel/testing/index.html
+share/doc/qemu/devel/testing/main.html
+share/doc/qemu/devel/testing/qgraph.html
+share/doc/qemu/devel/testing/qtest.html
share/doc/qemu/devel/tracing.html
share/doc/qemu/devel/trivial-patches.html
share/doc/qemu/devel/ui.html
@@ -218,6 +227,7 @@ share/doc/qemu/specs/ppc-spapr-xive.html
share/doc/qemu/specs/ppc-xive.html
share/doc/qemu/specs/pvpanic.html
share/doc/qemu/specs/rapl-msr.html
+share/doc/qemu/specs/riscv-iommu.html
share/doc/qemu/specs/rocker.html
share/doc/qemu/specs/sev-guest-firmware.html
share/doc/qemu/specs/spdm.html
@@ -238,20 +248,20 @@ share/doc/qemu/system/arm/cubieboard.htm
share/doc/qemu/system/arm/digic.html
share/doc/qemu/system/arm/emcraft-sf2.html
share/doc/qemu/system/arm/emulation.html
-share/doc/qemu/system/arm/gumstix.html
+share/doc/qemu/system/arm/exynos.html
+share/doc/qemu/system/arm/fby35.html
share/doc/qemu/system/arm/highbank.html
share/doc/qemu/system/arm/imx25-pdk.html
share/doc/qemu/system/arm/integratorcp.html
share/doc/qemu/system/arm/kzm.html
-share/doc/qemu/system/arm/mainstone.html
+share/doc/qemu/system/arm/mcimx6ul-evk.html
+share/doc/qemu/system/arm/mcimx7d-sabre.html
share/doc/qemu/system/arm/mps2.html
share/doc/qemu/system/arm/musca.html
share/doc/qemu/system/arm/musicpal.html
share/doc/qemu/system/arm/nrf.html
-share/doc/qemu/system/arm/nseries.html
share/doc/qemu/system/arm/nuvoton.html
share/doc/qemu/system/arm/orangepi.html
-share/doc/qemu/system/arm/palm.html
share/doc/qemu/system/arm/raspi.html
share/doc/qemu/system/arm/realview.html
share/doc/qemu/system/arm/sabrelite.html
@@ -264,8 +274,8 @@ share/doc/qemu/system/arm/vexpress.html
share/doc/qemu/system/arm/virt.html
share/doc/qemu/system/arm/xenpvh.html
share/doc/qemu/system/arm/xlnx-versal-virt.html
+share/doc/qemu/system/arm/xlnx-zcu102.html
share/doc/qemu/system/arm/xlnx-zynq.html
-share/doc/qemu/system/arm/xscale.html
share/doc/qemu/system/authz.html
share/doc/qemu/system/barrier.html
share/doc/qemu/system/bootindex.html
@@ -299,9 +309,11 @@ 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/nitro-enclave.html
share/doc/qemu/system/i386/pc.html
share/doc/qemu/system/i386/sgx.html
share/doc/qemu/system/i386/xen.html
+share/doc/qemu/system/i386/xenpvh.html
share/doc/qemu/system/images.html
share/doc/qemu/system/index.html
share/doc/qemu/system/introduction.html
@@ -374,7 +386,6 @@ share/doc/qemu/tools/qemu-pr-helper.html
share/doc/qemu/tools/qemu-storage-daemon.html
share/doc/qemu/tools/qemu-trace-stap.html
share/doc/qemu/tools/qemu-vmsr-helper.html
-share/doc/qemu/tools/virtfs-proxy-helper.html
share/doc/qemu/user/
share/doc/qemu/user/index.html
share/doc/qemu/user/main.html
@@ -424,6 +435,8 @@ share/qemu/edk2-i386-code.fd
share/qemu/edk2-i386-secure-code.fd
share/qemu/edk2-i386-vars.fd
share/qemu/edk2-licenses.txt
+share/qemu/edk2-loongarch64-code.fd
+share/qemu/edk2-loongarch64-vars.fd
share/qemu/edk2-riscv-code.fd
share/qemu/edk2-riscv-vars.fd
share/qemu/edk2-x86_64-code.fd
@@ -442,6 +455,7 @@ share/qemu/firmware/50-edk2-x86_64-secur
share/qemu/firmware/60-edk2-aarch64.json
share/qemu/firmware/60-edk2-arm.json
share/qemu/firmware/60-edk2-i386.json
+share/qemu/firmware/60-edk2-loongarch64.json
share/qemu/firmware/60-edk2-x86_64.json
share/qemu/hppa-firmware.img
share/qemu/hppa-firmware64.img
@@ -505,7 +519,6 @@ share/qemu/qboot.rom
share/qemu/qemu-nsis.bmp
share/qemu/qemu_vga.ndrv
share/qemu/s390-ccw.img
-share/qemu/s390-netboot.img
share/qemu/skiboot.lid
share/qemu/slof.bin
share/qemu/trace-events-all
