UPDATE: QEMU 7.1.0

Here is an update to QEMU 7.1.0.

Note upstream made a bunch of changes to QGA including moving the
function to retrieve network interfaces using getifaddrs() from
Linux specific to being OS agnostic. Builds but is not tested.

Definitely need someone to double check qmp_guest_network_get_interfaces()
which I based on the mostly duplicate function provided in the patch.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.224
diff -u -p -u -p -r1.224 Makefile
--- Makefile 2 Sep 2022 11:35:53 -0000 1.224
+++ Makefile 30 Aug 2022 19:17:04 -0000
@@ -4,15 +4,12 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent

-VERSION= 7.0.0
+VERSION= 7.1.0
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz

-REVISION-main= 1
-REVISION-ga= 0
-
HOMEPAGE= https://www.qemu.org/

MAINTAINER= Brad Smith <brad@comstyle.com>
@@ -88,7 +85,7 @@ CONFIGURE_ARGS= --localstatedir=${LOCALS
--cc="${CC}" \
--cxx="${CXX}" \
--host-cc="${CC}" \
- --enable-capstone=system \
+ --enable-capstone \
--disable-auth-pam \
--disable-bsd-user \
--disable-jack \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 distinfo
--- distinfo 24 Apr 2022 10:20:14 -0000 1.66
+++ distinfo 30 Aug 2022 19:19:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-7.0.0.tar.xz) = 9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk=
-SIZE (qemu-7.0.0.tar.xz) = 125117636
+SHA256 (qemu-7.1.0.tar.xz) = oGNOU2ve1XzzjsinUa2xJLicd2/ghG8hq2xnKPHLu+Y=
+SIZE (qemu-7.1.0.tar.xz) = 121833004
Index: patches/patch-audio_sndioaudio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_sndioaudio_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-audio_sndioaudio_c
--- patches/patch-audio_sndioaudio_c 11 Mar 2022 18:59:40 -0000 1.6
+++ patches/patch-audio_sndioaudio_c 29 Jul 2022 23:40:40 -0000
@@ -23,7 +23,7 @@ Index: audio/sndioaudio.c
+#include <poll.h>
+#include <sndio.h>
+#include "qemu/osdep.h"
-+#include "qemu-common.h"
++#include "qemu/help-texts.h"
+#include "qemu/main-loop.h"
+#include "audio.h"
+#include "trace.h"
Index: patches/patch-common-user_meson_build
===================================================================
RCS file: patches/patch-common-user_meson_build
diff -N patches/patch-common-user_meson_build
--- patches/patch-common-user_meson_build 29 Jun 2022 08:39:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-common-user: Only compile the common user code if have_user is set
-
-Index: common-user/meson.build
---- common-user/meson.build.orig
-+++ common-user/meson.build
-@@ -1,3 +1,7 @@
-+if not have_user
-+ subdir_done()
-+endif
-+
- common_user_inc += include_directories('host/' / host_arch)
-
- user_ss.add(files(
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 patch-configure
--- patches/patch-configure 2 Sep 2022 11:35:53 -0000 1.73
+++ patches/patch-configure 4 Sep 2022 03:13:41 -0000
@@ -14,7 +14,7 @@ Index: configure

rm -f config.log

-@@ -1538,7 +1539,6 @@ if test "$static" = "yes" ; then
+@@ -1354,7 +1355,6 @@ if test "$static" = "yes" ; then
plugins="no"
fi
fi
@@ -22,7 +22,7 @@ Index: configure

cat > $TMPC << EOF

-@@ -2144,6 +2144,56 @@ EOF
+@@ -1511,6 +1511,56 @@ if ! has "$pkg_config_exe"; then
fi

##########################################
@@ -78,8 +78,8 @@ Index: configure
+##########################################
# glib support probe

- glib_req_ver=2.56
-@@ -2917,6 +2967,15 @@ fi
+ # When bumping glib_req_ver, please check also whether we should increase
+@@ -2481,6 +2531,15 @@ fi

if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
Index: patches/patch-meson_build
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_build,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-meson_build
--- patches/patch-meson_build 24 Apr 2022 10:20:14 -0000 1.6
+++ patches/patch-meson_build 4 Sep 2022 03:13:30 -0000
@@ -5,7 +5,7 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -73,7 +73,7 @@ have_tools = get_option('tools') \
+@@ -75,7 +75,7 @@ have_tools = get_option('tools') \
.allowed()
have_ga = get_option('guest_agent') \
.disable_auto_if(not have_system and not have_tools) \
@@ -14,7 +14,7 @@ Index: meson.build
error_message: 'unsupported OS for QEMU guest agent') \
.allowed()
have_block = have_system or have_tools
-@@ -598,6 +598,11 @@ if not get_option('jack').auto() or have_system
+@@ -681,6 +681,11 @@ if not get_option('jack').auto() or have_system
jack = dependency('jack', required: get_option('jack'),
method: 'pkg-config', kwargs: static_kwargs)
endif
@@ -26,7 +26,7 @@ Index: meson.build

spice_protocol = not_found
if not get_option('spice_protocol').auto() or have_system
-@@ -1382,6 +1387,7 @@ if have_system
+@@ -1597,6 +1602,7 @@ if have_system
'oss': oss.found(),
'pa': pulse.found(),
'sdl': sdl.found(),
@@ -34,7 +34,7 @@ Index: meson.build
}
foreach k, v: audio_drivers_available
config_host_data.set('CONFIG_AUDIO_' + k.to_upper(), v)
-@@ -1389,7 +1395,7 @@ if have_system
+@@ -1604,7 +1610,7 @@ if have_system

# Default to native drivers first, OSS second, SDL third
audio_drivers_priority = \
@@ -43,7 +43,7 @@ Index: meson.build
(targetos == 'linux' ? [] : [ 'sdl' ])
audio_drivers_default = []
foreach k: audio_drivers_priority
-@@ -1492,7 +1498,7 @@ config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH'
+@@ -1729,7 +1735,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'))
@@ -52,7 +52,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'))

-@@ -3524,11 +3530,9 @@ if targetos == 'darwin'
+@@ -3767,11 +3773,9 @@ if targetos == 'darwin'
summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
@@ -64,7 +64,7 @@ Index: meson.build
+ (get_option('debug') ? ['-g'] : []))}
endif
if targetos == 'darwin'
-@@ -3682,6 +3686,7 @@ if vnc.found()
+@@ -3927,6 +3931,7 @@ if vnc.found()
endif
if targetos not in ['darwin', 'haiku', 'windows']
summary_info += {'OSS support': oss}
Index: patches/patch-meson_options_txt
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_options_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-meson_options_txt
--- patches/patch-meson_options_txt 24 Apr 2022 10:20:14 -0000 1.3
+++ patches/patch-meson_options_txt 29 Jul 2022 23:07:50 -0000
@@ -3,21 +3,21 @@ sndio module
Index: meson_options.txt
--- meson_options.txt.orig
+++ meson_options.txt
-@@ -17,7 +17,7 @@ option('iasl', type : 'string', value : '',
+@@ -21,7 +21,7 @@ option('tls_priority', type : 'string', value : 'NORMA
option('default_devices', type : 'boolean', value : true,
description: 'Include a default selection of devices in emulators')
option('audio_drv_list', type: 'array', value: ['default'],
- choices: ['alsa', 'coreaudio', 'default', 'dsound', 'jack', 'oss', 'pa', 'sdl'],
+ choices: ['alsa', 'coreaudio', 'default', 'dsound', 'jack', 'oss', 'pa', 'sdl', 'sndio'],
description: 'Set audio driver list')
- option('fuzzing_engine', type : 'string', value : '',
- description: 'fuzzing engine library for OSS-Fuzz')
-@@ -212,6 +212,8 @@ option('oss', type: 'feature', value: 'auto',
+ option('block_drv_rw_whitelist', type : 'string', value : '',
+ description: 'set block driver read-write whitelist (by default affects only QEMU, not tools like qemu-img)')
+@@ -240,6 +240,8 @@ option('oss', type: 'feature', value: 'auto',
description: 'OSS sound support')
option('pa', type: 'feature', value: 'auto',
description: 'PulseAudio sound support')
+option('sndio', type: 'feature', value: 'auto',
+ description: 'sndio sound support')

- option('vhost_user_blk_server', type: 'feature', value: 'auto',
- description: 'build vhost-user-blk server')
+ option('vhost_kernel', type: 'feature', value: 'auto',
+ description: 'vhost kernel backend support')
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 24 Apr 2022 10:20:14 -0000 1.8
+++ patches/patch-qapi_audio_json 3 Sep 2022 23:23:59 -0000
@@ -19,7 +19,7 @@ Index: qapi/audio.json
+#
+# @latency: play buffer size (in microseconds)
+#
-+# Since: 7.1
++# Since: 7.2
+##
+{ 'struct': 'AudiodevSndioOptions',
+ 'data': {
@@ -32,7 +32,7 @@ Index: qapi/audio.json
# @AudiodevCoreaudioPerDirectionOptions:
#
# Options of the Core Audio backend that are used for both playback and
-@@ -388,7 +410,7 @@
+@@ -387,7 +409,7 @@
##
{ 'enum': 'AudiodevDriver',
'data': [ 'none', 'alsa', 'coreaudio', 'dbus', 'dsound', 'jack', 'oss', 'pa',
@@ -41,7 +41,7 @@ Index: qapi/audio.json

##
# @Audiodev:
-@@ -419,5 +441,6 @@
+@@ -418,5 +440,6 @@
'oss': 'AudiodevOssOptions',
'pa': 'AudiodevPaOptions',
'sdl': 'AudiodevSdlOptions',
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 24 Apr 2022 10:20:14 -0000 1.12
+++ patches/patch-qemu-options_hx 29 Jul 2022 23:07:50 -0000
@@ -3,7 +3,7 @@ sndio module
Index: qemu-options.hx
--- qemu-options.hx.orig
+++ qemu-options.hx
-@@ -710,6 +710,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
+@@ -767,6 +767,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
" in|out.buffer-count= number of buffers\n"