UPDATE: QEMU 5.2.0

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: QEMU 5.2.0

Brad Smith-14
Thanks to new Sphinx here is an update to QEMU 5.2.0.

There is currently a conversion to meson under way. I believe everything
has been picked up Ok.

Testing and feedback welcome.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.202
diff -u -p -u -p -r1.202 Makefile
--- Makefile 21 Feb 2021 21:24:06 -0000 1.202
+++ Makefile 22 Feb 2021 08:53:20 -0000
@@ -5,8 +5,7 @@ DPB_PROPERTIES= parallel
 
 COMMENT= multi system emulator
 
-DISTNAME= qemu-5.1.0
-REVISION= 2
+DISTNAME= qemu-5.2.0
 CATEGORIES= emulators
 MASTER_SITES= https://download.qemu.org/
 EXTRACT_SUFX= .tar.xz
@@ -18,12 +17,11 @@ MAINTAINER= Brad Smith <[hidden email]
 # GPLv2, LGPLv2 and BSD
 PERMIT_PACKAGE= Yes
 
-WANTLIB= SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl \
- curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
- gnutls gobject-2.0 gthread-2.0 gtk-3 harfbuzz iconv intl \
- iscsi jpeg lzo2 m nettle nfs pango-1.0 pangocairo-1.0 \
+WANTLIB= SDL2 X11 bz2 c cairo capstone curl curses epoxy gbm gdk-3 \
+ gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0 \
+ gthread-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nettle nfs \
  pixman-1 png sndio ssh usb-1.0 util vte-2.91 xkbcommon \
- xml2 z zstd ${COMPILER_LIBCXX}
+ z zstd ${COMPILER_LIBCXX}
 
 # Using TLS emulation layer
 COMPILER= base-clang ports-gcc
@@ -34,13 +32,13 @@ MODPY_RUNDEP= No
 MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS= devel/gettext,-tools \
+ devel/ninja \
  textproc/py-sphinx${MODPY_FLAVOR}>=3.5.1
 LIB_DEPENDS= archivers/bzip2 \
  archivers/lzo2 \
  archivers/zstd \
  converters/libiconv \
  devel/capstone/main \
- devel/dtc \
  devel/gettext,-runtime \
  devel/glib2 \
  devel/libiscsi \
@@ -64,9 +62,6 @@ FAKE_FLAGS= qemu_confdir=${PREFIX}/share
 EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
 EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
 
-# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
-EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
-
 # until the system headers are fixed properly.
 EXTRA_CFLAGS+= -Wno-redundant-decls
 
@@ -85,7 +80,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
  --extra-ldflags="${EXTRA_LDFLAGS}" \
  --disable-bsd-user \
  --enable-capstone=system \
- --enable-curses \
  --disable-auth-pam \
  --disable-gcrypt \
  --disable-sdl-image \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo 17 Aug 2020 09:58:44 -0000 1.62
+++ distinfo 21 Dec 2020 06:55:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
-SIZE (qemu-5.1.0.tar.xz) = 62911540
+SHA256 (qemu-5.2.0.tar.xz) = yxjYibYo++Y3ZysDJnidmw47gCfgRFuTZTfHhUnfF7w=
+SIZE (qemu-5.2.0.tar.xz) = 106902800
Index: patches/patch-audio_Makefile_objs
===================================================================
RCS file: patches/patch-audio_Makefile_objs
diff -N patches/patch-audio_Makefile_objs
--- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
-
-sndio module
-
-Index: audio/Makefile.objs
---- audio/Makefile.objs.orig
-+++ audio/Makefile.objs
-@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
- sdl.mo-cflags := $(SDL_CFLAGS)
- sdl.mo-libs := $(SDL_LIBS)
-
-+# sndio module
-+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
-+sndio.mo-objs = sndioaudio.o
-+sndio.mo-libs := $(SNDIO_LIBS)
-+
- # jack module
- common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
- jack.mo-objs = jackaudio.o
Index: patches/patch-audio_audio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-audio_audio_c
--- patches/patch-audio_audio_c 17 Aug 2020 09:58:44 -0000 1.8
+++ patches/patch-audio_audio_c 11 Nov 2020 01:51:28 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-audio_audio_c,v 1.8 2020
 Index: audio/audio.c
 --- audio/audio.c.orig
 +++ audio/audio.c
-@@ -1973,6 +1973,7 @@ void audio_create_pdos(Audiodev *dev)
+@@ -2027,6 +2027,7 @@ void audio_create_pdos(Audiodev *dev)
          CASE(OSS, oss, Oss);
          CASE(PA, pa, Pa);
          CASE(SDL, sdl, );
Index: patches/patch-audio_meson_build
===================================================================
RCS file: patches/patch-audio_meson_build
diff -N patches/patch-audio_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-audio_meson_build 22 Feb 2021 03:43:36 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+sndio module
+
+Index: audio/meson.build
+--- audio/meson.build.orig
++++ audio/meson.build
+@@ -17,6 +17,7 @@ foreach m : [
+   ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'],
+   ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'],
+   ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'],
++  ['CONFIG_AUDIO_SNDIO', 'sndio', sndio, 'sndioaudio.c'],
+   ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'],
+   ['CONFIG_SPICE', 'spice', spice, 'spiceaudio.c']
+ ]
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 patch-configure
--- patches/patch-configure 17 Aug 2020 09:58:44 -0000 1.66
+++ patches/patch-configure 21 Dec 2020 06:58:26 -0000
@@ -5,7 +5,7 @@ sndio module
 Index: configure
 --- configure.orig
 +++ configure
-@@ -857,8 +857,8 @@ NetBSD)
+@@ -756,8 +756,8 @@ NetBSD)
  OpenBSD)
    bsd="yes"
    make="${MAKE-gmake}"
@@ -13,10 +13,10 @@ Index: configure
 -  audio_possible_drivers="sdl"
 +  audio_drv_list="sndio"
 +  audio_possible_drivers="sndio"
-   HOST_VARIANT_DIR="openbsd"
-   supported_os="yes"
  ;;
-@@ -3690,6 +3690,24 @@ fi
+ Darwin)
+   bsd="yes"
+@@ -3328,6 +3328,24 @@ fi
  ##########################################
  # Sound support libraries probe
 
@@ -41,7 +41,7 @@ Index: configure
  audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
  for drv in $audio_drv_list; do
      case $drv in
-@@ -3739,6 +3757,23 @@ for drv in $audio_drv_list; do
+@@ -3381,6 +3399,23 @@ for drv in $audio_drv_list; do
      fi
      ;;
 
@@ -65,31 +65,19 @@ Index: configure
      coreaudio)
        coreaudio_libs="-framework CoreAudio"
      ;;
-@@ -6524,10 +6559,6 @@ write_c_skeleton
+@@ -5667,7 +5702,6 @@ write_c_skeleton
  if test "$gcov" = "yes" ; then
-   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
--  CFLAGS="-O2 $CFLAGS"
+   :
+ elif test "$fortify_source" = "yes" ; then
+-  QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+   debug=no
  fi
 
- if test "$have_asan" = "yes"; then
-@@ -7182,7 +7213,7 @@ echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config
- for drv in $audio_drv_list; do
-     def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
-     case "$drv" in
-- alsa | oss | pa | sdl)
-+ alsa | oss | pa | sdl | sndio)
-    echo "$def=m" >> $config_host_mak ;;
- *)
-    echo "$def=y" >> $config_host_mak ;;
-@@ -7193,6 +7224,7 @@ echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
+@@ -6028,6 +6062,7 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
  echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
  echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
  echo "OSS_LIBS=$oss_libs" >> $config_host_mak
 +echo "SNDIO_LIBS=$sndio_libs" >> $config_host_mak
- echo "JACK_LIBS=$jack_libs" >> $config_host_mak
- if test "$audio_win_int" = "yes" ; then
-   echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
+ if test "$libjack" = "yes" ; then
+     echo "CONFIG_LIBJACK=y" >> $config_host_mak
+ fi
Index: patches/patch-hw_hppa_lasi_c
===================================================================
RCS file: patches/patch-hw_hppa_lasi_c
diff -N patches/patch-hw_hppa_lasi_c
--- patches/patch-hw_hppa_lasi_c 7 Oct 2020 19:55:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-hw_hppa_lasi_c,v 1.1 2020/10/07 19:55:57 cwen Exp $
-
-From upstream commit b899fe41:
-
-OpenBSD initializes the LASI IMR value with 0xffffffff to disable all LASI
-interrupts. This triggered an assert() and stopped the emulation.  By replacing
-the check with a warning in the guest log we now allow OpenBSD to boot again.
-
-Index: hw/hppa/lasi.c
---- hw/hppa/lasi.c.orig
-+++ hw/hppa/lasi.c
-@@ -11,6 +11,7 @@
-
- #include "qemu/osdep.h"
- #include "qemu/units.h"
-+#include "qemu/log.h"
- #include "qapi/error.h"
- #include "cpu.h"
- #include "trace.h"
-@@ -172,8 +173,11 @@ static MemTxResult lasi_chip_write_with_attrs(void *op
-         /* read-only.  */
-         break;
-     case LASI_IMR:
--        s->imr = val;  /* 0x20 ?? */
--        assert((val & LASI_IRQ_BITS) == val);
-+        s->imr = val;
-+        if (((val & LASI_IRQ_BITS) != val) && (val != 0xffffffff))
-+            qemu_log_mask(LOG_GUEST_ERROR,
-+                "LASI: tried to set invalid %lx IMR value.\n",
-+                (unsigned long) val);
-         break;
-     case LASI_IPR:
-         /* Any write to IPR clears the register. */
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 22 Feb 2021 03:44:04 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+- Fix curses build on OpenBSD
+- sndio module
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -509,7 +509,7 @@ if have_system and not get_option('curses').disabled()
+     endif
+   endif
+   if not curses.found()
+-    curses_compile_args = ['-DNCURSES_WIDECHAR']
++    curses_compile_args = ['-D_XOPEN_SOURCE_EXTENDED -DNCURSES_WIDECHAR']
+     has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
+     if targetos != 'windows' and not has_curses_h
+       message('Trying with /usr/include/ncursesw')
+@@ -621,6 +621,10 @@ endif
+ dsound = not_found
+ if 'CONFIG_AUDIO_DSOUND' in config_host
+   dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
++endif
++sndio = not_found
++if 'CONFIG_AUDIO_SNDIO' in config_host
++  sndio = declare_dependency(link_args: config_host['SNDIO_LIBS'].split())
+ endif
+ coreaudio = not_found
+ if 'CONFIG_AUDIO_COREAUDIO' in config_host
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-qapi_audio_json 11 Nov 2020 01:51:24 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-qapi_audio_json,v 1.4 20
 Index: qapi/audio.json
 --- qapi/audio.json.orig
 +++ qapi/audio.json
-@@ -102,6 +102,28 @@
+@@ -106,6 +106,28 @@
      '*threshold': 'uint32' } }
 
  ##
@@ -32,7 +32,7 @@ Index: qapi/audio.json
  # @AudiodevCoreaudioPerDirectionOptions:
  #
  # Options of the Core Audio backend that are used for both playback and
-@@ -352,7 +374,7 @@
+@@ -356,7 +378,7 @@
  ##
  { 'enum': 'AudiodevDriver',
    'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
@@ -41,7 +41,7 @@ Index: qapi/audio.json
 
  ##
  # @Audiodev:
-@@ -382,5 +404,6 @@
+@@ -386,5 +408,6 @@
      'oss':       'AudiodevOssOptions',
      'pa':        'AudiodevPaOptions',
      'sdl':       'AudiodevGenericOptions',
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 17 Aug 2020 09:58:44 -0000 1.7
+++ patches/patch-qemu-options_hx 11 Nov 2020 01:51:24 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-qemu-options_hx,v 1.7 20
 Index: qemu-options.hx
 --- qemu-options.hx.orig
 +++ qemu-options.hx
-@@ -590,6 +590,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
+@@ -582,6 +582,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
  #ifdef CONFIG_AUDIO_SDL
      "-audiodev sdl,id=id[,prop[=value][,...]]\n"
  #endif
@@ -13,7 +13,7 @@ Index: qemu-options.hx
  #ifdef CONFIG_SPICE
      "-audiodev spice,id=id[,prop[=value][,...]]\n"
  #endif
-@@ -747,6 +750,11 @@ SRST
+@@ -739,6 +742,11 @@ SRST
      Creates a backend using SDL. This backend is available on most
      systems, but you should use your platform's native backend if
      possible. This backend has no backend specific properties.
Index: patches/patch-tcg_ppc_tcg-target_c_inc
===================================================================
RCS file: patches/patch-tcg_ppc_tcg-target_c_inc
diff -N patches/patch-tcg_ppc_tcg-target_c_inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tcg_ppc_tcg-target_c_inc 22 Feb 2021 03:44:27 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Workaround the lack of _CALL_SYSV with clang on powerpc
+
+Index: tcg/ppc/tcg-target.c.inc
+--- tcg/ppc/tcg-target.c.inc.orig
++++ tcg/ppc/tcg-target.c.inc
+@@ -25,6 +25,11 @@
+ #include "elf.h"
+ #include "../tcg-pool.c.inc"
+
++/* Clang does not define _CALL_* */
++#if defined __clang__ && defined __ELF__
++#define _CALL_SYSV 1
++#endif
++
+ #if defined _CALL_DARWIN || defined __APPLE__
+ #define TCG_TARGET_CALL_DARWIN
+ #endif
Index: patches/patch-tcg_ppc_tcg-target_inc_c
===================================================================
RCS file: patches/patch-tcg_ppc_tcg-target_inc_c
diff -N patches/patch-tcg_ppc_tcg-target_inc_c
--- patches/patch-tcg_ppc_tcg-target_inc_c 15 May 2020 07:26:41 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-tcg_ppc_tcg-target_inc_c,v 1.7 2020/05/15 07:26:41 ajacoutot Exp $
-
-Workaround the lack of _CALL_SYSV with clang on powerpc
-
-Index: tcg/ppc/tcg-target.inc.c
---- tcg/ppc/tcg-target.inc.c.orig
-+++ tcg/ppc/tcg-target.inc.c
-@@ -25,6 +25,11 @@
- #include "elf.h"
- #include "../tcg-pool.inc.c"
-
-+/* clang does not define _CALL_* */
-+#if defined __clang__ && defined __ELF__
-+#define _CALL_SYSV 1
-+#endif
-+
- #if defined _CALL_DARWIN || defined __APPLE__
- #define TCG_TARGET_CALL_DARWIN
- #endif
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 PLIST
--- pkg/PLIST 20 Feb 2021 22:27:32 -0000 1.47
+++ pkg/PLIST 21 Feb 2021 22:08:23 -0000
@@ -19,7 +19,6 @@
 @bin bin/qemu-system-cris
 @bin bin/qemu-system-hppa
 @bin bin/qemu-system-i386
-@bin bin/qemu-system-lm32
 @bin bin/qemu-system-m68k
 @bin bin/qemu-system-microblaze
 @bin bin/qemu-system-microblazeel
@@ -41,7 +40,6 @@
 @bin bin/qemu-system-sparc
 @bin bin/qemu-system-sparc64
 @bin bin/qemu-system-tricore
-@bin bin/qemu-system-unicore32
 @bin bin/qemu-system-x86_64
 @bin bin/qemu-system-xtensa
 @bin bin/qemu-system-xtensaeb
@@ -53,6 +51,7 @@
 @man man/man7/qemu-qmp-ref.7
 @man man/man8/qemu-ga.8
 @man man/man8/qemu-nbd.8
+@man man/man8/qemu-pr-helper.8
 share/applications/qemu.desktop
 share/doc/pkg-readmes/${PKGSTEM}
 share/doc/qemu/
@@ -84,10 +83,8 @@ share/doc/qemu/interop/live-block-operat
 share/doc/qemu/interop/objects.inv
 share/doc/qemu/interop/pr-helper.html
 share/doc/qemu/interop/qemu-ga-ref.html
-share/doc/qemu/interop/qemu-ga-ref.txt
 share/doc/qemu/interop/qemu-ga.html
 share/doc/qemu/interop/qemu-qmp-ref.html
-share/doc/qemu/interop/qemu-qmp-ref.txt
 share/doc/qemu/interop/search.html
 share/doc/qemu/interop/searchindex.js
 share/doc/qemu/interop/vhost-user-gpu.html
@@ -116,6 +113,7 @@ share/doc/qemu/specs/acpi_hw_reduced_hot
 share/doc/qemu/specs/genindex.html
 share/doc/qemu/specs/index.html
 share/doc/qemu/specs/objects.inv
+share/doc/qemu/specs/ppc-spapr-numa.html
 share/doc/qemu/specs/ppc-spapr-xive.html
 share/doc/qemu/specs/ppc-xive.html
 share/doc/qemu/specs/search.html
@@ -150,19 +148,27 @@ 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/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/sbsa.html
 share/doc/qemu/system/arm/stellaris.html
 share/doc/qemu/system/arm/sx1.html
 share/doc/qemu/system/arm/versatile.html
 share/doc/qemu/system/arm/vexpress.html
 share/doc/qemu/system/arm/virt.html
+share/doc/qemu/system/arm/xlnx-versal-virt.html
 share/doc/qemu/system/arm/xscale.html
 share/doc/qemu/system/build-platforms.html
+share/doc/qemu/system/cpu-hotplug.html
 share/doc/qemu/system/deprecated.html
 share/doc/qemu/system/gdb.html
 share/doc/qemu/system/genindex.html
+share/doc/qemu/system/i386/
+share/doc/qemu/system/i386/microvm.html
+share/doc/qemu/system/i386/pc.html
 share/doc/qemu/system/images.html
 share/doc/qemu/system/index.html
 share/doc/qemu/system/invocation.html
@@ -175,12 +181,14 @@ share/doc/qemu/system/monitor.html
 share/doc/qemu/system/mux-chardev.html
 share/doc/qemu/system/net.html
 share/doc/qemu/system/objects.inv
+share/doc/qemu/system/pr-manager.html
 share/doc/qemu/system/qemu-block-drivers.html
 share/doc/qemu/system/qemu-cpu-models.html
 share/doc/qemu/system/qemu-manpage.html
 share/doc/qemu/system/quickstart.html
 share/doc/qemu/system/s390x/
 share/doc/qemu/system/s390x/3270.html
+share/doc/qemu/system/s390x/bootdevices.html
 share/doc/qemu/system/s390x/css.html
 share/doc/qemu/system/s390x/protvirt.html
 share/doc/qemu/system/s390x/vfio-ap.html
@@ -202,6 +210,8 @@ share/doc/qemu/system/target-xtensa.html
 share/doc/qemu/system/targets.html
 share/doc/qemu/system/tls.html
 share/doc/qemu/system/usb.html
+share/doc/qemu/system/virtio-net-failover.html
+share/doc/qemu/system/virtio-pmem.html
 share/doc/qemu/system/vnc-security.html
 share/doc/qemu/tools/
 share/doc/qemu/tools/.buildinfo
@@ -226,6 +236,7 @@ share/doc/qemu/tools/index.html
 share/doc/qemu/tools/objects.inv
 share/doc/qemu/tools/qemu-img.html
 share/doc/qemu/tools/qemu-nbd.html
+share/doc/qemu/tools/qemu-pr-helper.html
 share/doc/qemu/tools/qemu-trace-stap.html
 share/doc/qemu/tools/search.html
 share/doc/qemu/tools/searchindex.js
@@ -358,13 +369,14 @@ share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/linuxboot_dma.bin
 share/qemu/multiboot.bin
+share/qemu/npcm7xx_bootrom.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
 share/qemu/openbios-sparc64
-share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv32-virt-fw_jump.bin
-share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv64-virt-fw_jump.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
 share/qemu/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
@@ -375,6 +387,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qboot.rom
 share/qemu/qemu-nsis.bmp
 share/qemu/qemu_vga.ndrv
 share/qemu/s390-ccw.img

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: QEMU 5.2.0

Landry Breuil-5
On Mon, Feb 22, 2021 at 04:09:55AM -0500, Brad Smith wrote:
> Thanks to new Sphinx here is an update to QEMU 5.2.0.
>
> There is currently a conversion to meson under way. I believe everything
> has been picked up Ok.

would it be possible (or too much a hassle) to subpackage
qemu-guest-agent ? being able to install it (iirc it only depends on
glib) without having the complete thing would be nice !

Landry

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: QEMU 5.2.0

Brad Smith-14
On 2/22/2021 4:20 AM, Landry Breuil wrote:
> On Mon, Feb 22, 2021 at 04:09:55AM -0500, Brad Smith wrote:
>> Thanks to new Sphinx here is an update to QEMU 5.2.0.
>>
>> There is currently a conversion to meson under way. I believe everything
>> has been picked up Ok.
> would it be possible (or too much a hassle) to subpackage
> qemu-guest-agent ? being able to install it (iirc it only depends on
> glib) without having the complete thing would be nice !

So just qemu-ga and it's man page as a sub-package?

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: QEMU 5.2.0

Landry Breuil-5
On Mon, Feb 22, 2021 at 04:33:16AM -0500, Brad Smith wrote:

> On 2/22/2021 4:20 AM, Landry Breuil wrote:
> > On Mon, Feb 22, 2021 at 04:09:55AM -0500, Brad Smith wrote:
> > > Thanks to new Sphinx here is an update to QEMU 5.2.0.
> > >
> > > There is currently a conversion to meson under way. I believe everything
> > > has been picked up Ok.
> > would it be possible (or too much a hassle) to subpackage
> > qemu-guest-agent ? being able to install it (iirc it only depends on
> > glib) without having the complete thing would be nice !
>
> So just qemu-ga and it's man page as a sub-package?

yeah that's the idea, so that ppl running openbsd in kvm VMs can install
it without the fullblown qemu.that's also how debian  subpackages it, cf
https://packages.debian.org/bullseye/qemu-guest-agent

i had tested it with some success within proxmox, cf
https://undeadly.org/cgi?action=article;sid=20200514073852 - sure not
all functions work but that's a start.

Landry

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: QEMU 5.2.0

Antoine Jacoutot-7
In reply to this post by Brad Smith-14
On Mon, Feb 22, 2021 at 04:09:55AM -0500, Brad Smith wrote:

> Thanks to new Sphinx here is an update to QEMU 5.2.0.
>
> There is currently a conversion to meson under way. I believe everything
> has been picked up Ok.
>
> Testing and feedback welcome.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
> retrieving revision 1.202
> diff -u -p -u -p -r1.202 Makefile
> --- Makefile 21 Feb 2021 21:24:06 -0000 1.202
> +++ Makefile 22 Feb 2021 08:53:20 -0000
> @@ -5,8 +5,7 @@ DPB_PROPERTIES= parallel
>  
>  COMMENT= multi system emulator
>  
> -DISTNAME= qemu-5.1.0
> -REVISION= 2
> +DISTNAME= qemu-5.2.0
>  CATEGORIES= emulators
>  MASTER_SITES= https://download.qemu.org/
>  EXTRACT_SUFX= .tar.xz
> @@ -18,12 +17,11 @@ MAINTAINER= Brad Smith <[hidden email]
>  # GPLv2, LGPLv2 and BSD
>  PERMIT_PACKAGE= Yes
>  
> -WANTLIB= SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl \
> - curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
> - gnutls gobject-2.0 gthread-2.0 gtk-3 harfbuzz iconv intl \
> - iscsi jpeg lzo2 m nettle nfs pango-1.0 pangocairo-1.0 \
> +WANTLIB= SDL2 X11 bz2 c cairo capstone curl curses epoxy gbm gdk-3 \
> + gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0 \
> + gthread-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nettle nfs \
>   pixman-1 png sndio ssh usb-1.0 util vte-2.91 xkbcommon \
> - xml2 z zstd ${COMPILER_LIBCXX}
> + z zstd ${COMPILER_LIBCXX}
>  
>  # Using TLS emulation layer
>  COMPILER= base-clang ports-gcc
> @@ -34,13 +32,13 @@ MODPY_RUNDEP= No
>  MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>  
>  BUILD_DEPENDS= devel/gettext,-tools \
> + devel/ninja \

Why is this needed?

>   textproc/py-sphinx${MODPY_FLAVOR}>=3.5.1
>  LIB_DEPENDS= archivers/bzip2 \
>   archivers/lzo2 \
>   archivers/zstd \
>   converters/libiconv \
>   devel/capstone/main \
> - devel/dtc \
>   devel/gettext,-runtime \
>   devel/glib2 \
>   devel/libiscsi \
> @@ -64,9 +62,6 @@ FAKE_FLAGS= qemu_confdir=${PREFIX}/share
>  EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
>  EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
>  
> -# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
> -EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
> -
>  # until the system headers are fixed properly.
>  EXTRA_CFLAGS+= -Wno-redundant-decls
>  
> @@ -85,7 +80,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
>   --extra-ldflags="${EXTRA_LDFLAGS}" \
>   --disable-bsd-user \
>   --enable-capstone=system \
> - --enable-curses \
>   --disable-auth-pam \
>   --disable-gcrypt \
>   --disable-sdl-image \
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 distinfo
> --- distinfo 17 Aug 2020 09:58:44 -0000 1.62
> +++ distinfo 21 Dec 2020 06:55:46 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
> -SIZE (qemu-5.1.0.tar.xz) = 62911540
> +SHA256 (qemu-5.2.0.tar.xz) = yxjYibYo++Y3ZysDJnidmw47gCfgRFuTZTfHhUnfF7w=
> +SIZE (qemu-5.2.0.tar.xz) = 106902800
> Index: patches/patch-audio_Makefile_objs
> ===================================================================
> RCS file: patches/patch-audio_Makefile_objs
> diff -N patches/patch-audio_Makefile_objs
> --- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
> -
> -sndio module
> -
> -Index: audio/Makefile.objs
> ---- audio/Makefile.objs.orig
> -+++ audio/Makefile.objs
> -@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
> - sdl.mo-cflags := $(SDL_CFLAGS)
> - sdl.mo-libs := $(SDL_LIBS)
> -
> -+# sndio module
> -+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
> -+sndio.mo-objs = sndioaudio.o
> -+sndio.mo-libs := $(SNDIO_LIBS)
> -+
> - # jack module
> - common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
> - jack.mo-objs = jackaudio.o
> Index: patches/patch-audio_audio_c
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 patch-audio_audio_c
> --- patches/patch-audio_audio_c 17 Aug 2020 09:58:44 -0000 1.8
> +++ patches/patch-audio_audio_c 11 Nov 2020 01:51:28 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-audio_audio_c,v 1.8 2020
>  Index: audio/audio.c
>  --- audio/audio.c.orig
>  +++ audio/audio.c
> -@@ -1973,6 +1973,7 @@ void audio_create_pdos(Audiodev *dev)
> +@@ -2027,6 +2027,7 @@ void audio_create_pdos(Audiodev *dev)
>           CASE(OSS, oss, Oss);
>           CASE(PA, pa, Pa);
>           CASE(SDL, sdl, );
> Index: patches/patch-audio_meson_build
> ===================================================================
> RCS file: patches/patch-audio_meson_build
> diff -N patches/patch-audio_meson_build
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-audio_meson_build 22 Feb 2021 03:43:36 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +sndio module
> +
> +Index: audio/meson.build
> +--- audio/meson.build.orig
> ++++ audio/meson.build
> +@@ -17,6 +17,7 @@ foreach m : [
> +   ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'],
> +   ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'],
> +   ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'],
> ++  ['CONFIG_AUDIO_SNDIO', 'sndio', sndio, 'sndioaudio.c'],
> +   ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'],
> +   ['CONFIG_SPICE', 'spice', spice, 'spiceaudio.c']
> + ]
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
> retrieving revision 1.66
> diff -u -p -u -p -r1.66 patch-configure
> --- patches/patch-configure 17 Aug 2020 09:58:44 -0000 1.66
> +++ patches/patch-configure 21 Dec 2020 06:58:26 -0000
> @@ -5,7 +5,7 @@ sndio module
>  Index: configure
>  --- configure.orig
>  +++ configure
> -@@ -857,8 +857,8 @@ NetBSD)
> +@@ -756,8 +756,8 @@ NetBSD)
>   OpenBSD)
>     bsd="yes"
>     make="${MAKE-gmake}"
> @@ -13,10 +13,10 @@ Index: configure
>  -  audio_possible_drivers="sdl"
>  +  audio_drv_list="sndio"
>  +  audio_possible_drivers="sndio"
> -   HOST_VARIANT_DIR="openbsd"
> -   supported_os="yes"
>   ;;
> -@@ -3690,6 +3690,24 @@ fi
> + Darwin)
> +   bsd="yes"
> +@@ -3328,6 +3328,24 @@ fi
>   ##########################################
>   # Sound support libraries probe
>  
> @@ -41,7 +41,7 @@ Index: configure
>   audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
>   for drv in $audio_drv_list; do
>       case $drv in
> -@@ -3739,6 +3757,23 @@ for drv in $audio_drv_list; do
> +@@ -3381,6 +3399,23 @@ for drv in $audio_drv_list; do
>       fi
>       ;;
>  
> @@ -65,31 +65,19 @@ Index: configure
>       coreaudio)
>         coreaudio_libs="-framework CoreAudio"
>       ;;
> -@@ -6524,10 +6559,6 @@ write_c_skeleton
> +@@ -5667,7 +5702,6 @@ write_c_skeleton
>   if test "$gcov" = "yes" ; then
> -   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
> -   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
> --elif test "$fortify_source" = "yes" ; then
> --  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
> --elif test "$debug" = "no"; then
> --  CFLAGS="-O2 $CFLAGS"
> +   :
> + elif test "$fortify_source" = "yes" ; then
> +-  QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
> +   debug=no
>   fi
>  
> - if test "$have_asan" = "yes"; then
> -@@ -7182,7 +7213,7 @@ echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config
> - for drv in $audio_drv_list; do
> -     def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
> -     case "$drv" in
> -- alsa | oss | pa | sdl)
> -+ alsa | oss | pa | sdl | sndio)
> -    echo "$def=m" >> $config_host_mak ;;
> - *)
> -    echo "$def=y" >> $config_host_mak ;;
> -@@ -7193,6 +7224,7 @@ echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
> +@@ -6028,6 +6062,7 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
>   echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
>   echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
>   echo "OSS_LIBS=$oss_libs" >> $config_host_mak
>  +echo "SNDIO_LIBS=$sndio_libs" >> $config_host_mak
> - echo "JACK_LIBS=$jack_libs" >> $config_host_mak
> - if test "$audio_win_int" = "yes" ; then
> -   echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
> + if test "$libjack" = "yes" ; then
> +     echo "CONFIG_LIBJACK=y" >> $config_host_mak
> + fi
> Index: patches/patch-hw_hppa_lasi_c
> ===================================================================
> RCS file: patches/patch-hw_hppa_lasi_c
> diff -N patches/patch-hw_hppa_lasi_c
> --- patches/patch-hw_hppa_lasi_c 7 Oct 2020 19:55:57 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-hw_hppa_lasi_c,v 1.1 2020/10/07 19:55:57 cwen Exp $
> -
> -From upstream commit b899fe41:
> -
> -OpenBSD initializes the LASI IMR value with 0xffffffff to disable all LASI
> -interrupts. This triggered an assert() and stopped the emulation.  By replacing
> -the check with a warning in the guest log we now allow OpenBSD to boot again.
> -
> -Index: hw/hppa/lasi.c
> ---- hw/hppa/lasi.c.orig
> -+++ hw/hppa/lasi.c
> -@@ -11,6 +11,7 @@
> -
> - #include "qemu/osdep.h"
> - #include "qemu/units.h"
> -+#include "qemu/log.h"
> - #include "qapi/error.h"
> - #include "cpu.h"
> - #include "trace.h"
> -@@ -172,8 +173,11 @@ static MemTxResult lasi_chip_write_with_attrs(void *op
> -         /* read-only.  */
> -         break;
> -     case LASI_IMR:
> --        s->imr = val;  /* 0x20 ?? */
> --        assert((val & LASI_IRQ_BITS) == val);
> -+        s->imr = val;
> -+        if (((val & LASI_IRQ_BITS) != val) && (val != 0xffffffff))
> -+            qemu_log_mask(LOG_GUEST_ERROR,
> -+                "LASI: tried to set invalid %lx IMR value.\n",
> -+                (unsigned long) val);
> -         break;
> -     case LASI_IPR:
> -         /* Any write to IPR clears the register. */
> Index: patches/patch-meson_build
> ===================================================================
> RCS file: patches/patch-meson_build
> diff -N patches/patch-meson_build
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-meson_build 22 Feb 2021 03:44:04 -0000
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +- Fix curses build on OpenBSD
> +- sndio module
> +
> +Index: meson.build
> +--- meson.build.orig
> ++++ meson.build
> +@@ -509,7 +509,7 @@ if have_system and not get_option('curses').disabled()
> +     endif
> +   endif
> +   if not curses.found()
> +-    curses_compile_args = ['-DNCURSES_WIDECHAR']
> ++    curses_compile_args = ['-D_XOPEN_SOURCE_EXTENDED -DNCURSES_WIDECHAR']
> +     has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
> +     if targetos != 'windows' and not has_curses_h
> +       message('Trying with /usr/include/ncursesw')
> +@@ -621,6 +621,10 @@ endif
> + dsound = not_found
> + if 'CONFIG_AUDIO_DSOUND' in config_host
> +   dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
> ++endif
> ++sndio = not_found
> ++if 'CONFIG_AUDIO_SNDIO' in config_host
> ++  sndio = declare_dependency(link_args: config_host['SNDIO_LIBS'].split())
> + endif
> + coreaudio = not_found
> + if 'CONFIG_AUDIO_COREAUDIO' in config_host
> Index: patches/patch-qapi_audio_json
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-qapi_audio_json
> --- patches/patch-qapi_audio_json 17 Aug 2020 09:58:44 -0000 1.4
> +++ patches/patch-qapi_audio_json 11 Nov 2020 01:51:24 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-qapi_audio_json,v 1.4 20
>  Index: qapi/audio.json
>  --- qapi/audio.json.orig
>  +++ qapi/audio.json
> -@@ -102,6 +102,28 @@
> +@@ -106,6 +106,28 @@
>       '*threshold': 'uint32' } }
>  
>   ##
> @@ -32,7 +32,7 @@ Index: qapi/audio.json
>   # @AudiodevCoreaudioPerDirectionOptions:
>   #
>   # Options of the Core Audio backend that are used for both playback and
> -@@ -352,7 +374,7 @@
> +@@ -356,7 +378,7 @@
>   ##
>   { 'enum': 'AudiodevDriver',
>     'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
> @@ -41,7 +41,7 @@ Index: qapi/audio.json
>  
>   ##
>   # @Audiodev:
> -@@ -382,5 +404,6 @@
> +@@ -386,5 +408,6 @@
>       'oss':       'AudiodevOssOptions',
>       'pa':        'AudiodevPaOptions',
>       'sdl':       'AudiodevGenericOptions',
> Index: patches/patch-qemu-options_hx
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 patch-qemu-options_hx
> --- patches/patch-qemu-options_hx 17 Aug 2020 09:58:44 -0000 1.7
> +++ patches/patch-qemu-options_hx 11 Nov 2020 01:51:24 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-qemu-options_hx,v 1.7 20
>  Index: qemu-options.hx
>  --- qemu-options.hx.orig
>  +++ qemu-options.hx
> -@@ -590,6 +590,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
> +@@ -582,6 +582,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
>   #ifdef CONFIG_AUDIO_SDL
>       "-audiodev sdl,id=id[,prop[=value][,...]]\n"
>   #endif
> @@ -13,7 +13,7 @@ Index: qemu-options.hx
>   #ifdef CONFIG_SPICE
>       "-audiodev spice,id=id[,prop[=value][,...]]\n"
>   #endif
> -@@ -747,6 +750,11 @@ SRST
> +@@ -739,6 +742,11 @@ SRST
>       Creates a backend using SDL. This backend is available on most
>       systems, but you should use your platform's native backend if
>       possible. This backend has no backend specific properties.
> Index: patches/patch-tcg_ppc_tcg-target_c_inc
> ===================================================================
> RCS file: patches/patch-tcg_ppc_tcg-target_c_inc
> diff -N patches/patch-tcg_ppc_tcg-target_c_inc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-tcg_ppc_tcg-target_c_inc 22 Feb 2021 03:44:27 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Workaround the lack of _CALL_SYSV with clang on powerpc
> +
> +Index: tcg/ppc/tcg-target.c.inc
> +--- tcg/ppc/tcg-target.c.inc.orig
> ++++ tcg/ppc/tcg-target.c.inc
> +@@ -25,6 +25,11 @@
> + #include "elf.h"
> + #include "../tcg-pool.c.inc"
> +
> ++/* Clang does not define _CALL_* */
> ++#if defined __clang__ && defined __ELF__
> ++#define _CALL_SYSV 1
> ++#endif
> ++
> + #if defined _CALL_DARWIN || defined __APPLE__
> + #define TCG_TARGET_CALL_DARWIN
> + #endif
> Index: patches/patch-tcg_ppc_tcg-target_inc_c
> ===================================================================
> RCS file: patches/patch-tcg_ppc_tcg-target_inc_c
> diff -N patches/patch-tcg_ppc_tcg-target_inc_c
> --- patches/patch-tcg_ppc_tcg-target_inc_c 15 May 2020 07:26:41 -0000 1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-tcg_ppc_tcg-target_inc_c,v 1.7 2020/05/15 07:26:41 ajacoutot Exp $
> -
> -Workaround the lack of _CALL_SYSV with clang on powerpc
> -
> -Index: tcg/ppc/tcg-target.inc.c
> ---- tcg/ppc/tcg-target.inc.c.orig
> -+++ tcg/ppc/tcg-target.inc.c
> -@@ -25,6 +25,11 @@
> - #include "elf.h"
> - #include "../tcg-pool.inc.c"
> -
> -+/* clang does not define _CALL_* */
> -+#if defined __clang__ && defined __ELF__
> -+#define _CALL_SYSV 1
> -+#endif
> -+
> - #if defined _CALL_DARWIN || defined __APPLE__
> - #define TCG_TARGET_CALL_DARWIN
> - #endif
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
> retrieving revision 1.47
> diff -u -p -u -p -r1.47 PLIST
> --- pkg/PLIST 20 Feb 2021 22:27:32 -0000 1.47
> +++ pkg/PLIST 21 Feb 2021 22:08:23 -0000
> @@ -19,7 +19,6 @@
>  @bin bin/qemu-system-cris
>  @bin bin/qemu-system-hppa
>  @bin bin/qemu-system-i386
> -@bin bin/qemu-system-lm32
>  @bin bin/qemu-system-m68k
>  @bin bin/qemu-system-microblaze
>  @bin bin/qemu-system-microblazeel
> @@ -41,7 +40,6 @@
>  @bin bin/qemu-system-sparc
>  @bin bin/qemu-system-sparc64
>  @bin bin/qemu-system-tricore
> -@bin bin/qemu-system-unicore32
>  @bin bin/qemu-system-x86_64
>  @bin bin/qemu-system-xtensa
>  @bin bin/qemu-system-xtensaeb
> @@ -53,6 +51,7 @@
>  @man man/man7/qemu-qmp-ref.7
>  @man man/man8/qemu-ga.8
>  @man man/man8/qemu-nbd.8
> +@man man/man8/qemu-pr-helper.8
>  share/applications/qemu.desktop
>  share/doc/pkg-readmes/${PKGSTEM}
>  share/doc/qemu/
> @@ -84,10 +83,8 @@ share/doc/qemu/interop/live-block-operat
>  share/doc/qemu/interop/objects.inv
>  share/doc/qemu/interop/pr-helper.html
>  share/doc/qemu/interop/qemu-ga-ref.html
> -share/doc/qemu/interop/qemu-ga-ref.txt
>  share/doc/qemu/interop/qemu-ga.html
>  share/doc/qemu/interop/qemu-qmp-ref.html
> -share/doc/qemu/interop/qemu-qmp-ref.txt
>  share/doc/qemu/interop/search.html
>  share/doc/qemu/interop/searchindex.js
>  share/doc/qemu/interop/vhost-user-gpu.html
> @@ -116,6 +113,7 @@ share/doc/qemu/specs/acpi_hw_reduced_hot
>  share/doc/qemu/specs/genindex.html
>  share/doc/qemu/specs/index.html
>  share/doc/qemu/specs/objects.inv
> +share/doc/qemu/specs/ppc-spapr-numa.html
>  share/doc/qemu/specs/ppc-spapr-xive.html
>  share/doc/qemu/specs/ppc-xive.html
>  share/doc/qemu/specs/search.html
> @@ -150,19 +148,27 @@ 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/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/sbsa.html
>  share/doc/qemu/system/arm/stellaris.html
>  share/doc/qemu/system/arm/sx1.html
>  share/doc/qemu/system/arm/versatile.html
>  share/doc/qemu/system/arm/vexpress.html
>  share/doc/qemu/system/arm/virt.html
> +share/doc/qemu/system/arm/xlnx-versal-virt.html
>  share/doc/qemu/system/arm/xscale.html
>  share/doc/qemu/system/build-platforms.html
> +share/doc/qemu/system/cpu-hotplug.html
>  share/doc/qemu/system/deprecated.html
>  share/doc/qemu/system/gdb.html
>  share/doc/qemu/system/genindex.html
> +share/doc/qemu/system/i386/
> +share/doc/qemu/system/i386/microvm.html
> +share/doc/qemu/system/i386/pc.html
>  share/doc/qemu/system/images.html
>  share/doc/qemu/system/index.html
>  share/doc/qemu/system/invocation.html
> @@ -175,12 +181,14 @@ share/doc/qemu/system/monitor.html
>  share/doc/qemu/system/mux-chardev.html
>  share/doc/qemu/system/net.html
>  share/doc/qemu/system/objects.inv
> +share/doc/qemu/system/pr-manager.html
>  share/doc/qemu/system/qemu-block-drivers.html
>  share/doc/qemu/system/qemu-cpu-models.html
>  share/doc/qemu/system/qemu-manpage.html
>  share/doc/qemu/system/quickstart.html
>  share/doc/qemu/system/s390x/
>  share/doc/qemu/system/s390x/3270.html
> +share/doc/qemu/system/s390x/bootdevices.html
>  share/doc/qemu/system/s390x/css.html
>  share/doc/qemu/system/s390x/protvirt.html
>  share/doc/qemu/system/s390x/vfio-ap.html
> @@ -202,6 +210,8 @@ share/doc/qemu/system/target-xtensa.html
>  share/doc/qemu/system/targets.html
>  share/doc/qemu/system/tls.html
>  share/doc/qemu/system/usb.html
> +share/doc/qemu/system/virtio-net-failover.html
> +share/doc/qemu/system/virtio-pmem.html
>  share/doc/qemu/system/vnc-security.html
>  share/doc/qemu/tools/
>  share/doc/qemu/tools/.buildinfo
> @@ -226,6 +236,7 @@ share/doc/qemu/tools/index.html
>  share/doc/qemu/tools/objects.inv
>  share/doc/qemu/tools/qemu-img.html
>  share/doc/qemu/tools/qemu-nbd.html
> +share/doc/qemu/tools/qemu-pr-helper.html
>  share/doc/qemu/tools/qemu-trace-stap.html
>  share/doc/qemu/tools/search.html
>  share/doc/qemu/tools/searchindex.js
> @@ -358,13 +369,14 @@ share/qemu/kvmvapic.bin
>  share/qemu/linuxboot.bin
>  share/qemu/linuxboot_dma.bin
>  share/qemu/multiboot.bin
> +share/qemu/npcm7xx_bootrom.bin
>  share/qemu/openbios-ppc
>  share/qemu/openbios-sparc32
>  share/qemu/openbios-sparc64
> -share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
> -share/qemu/opensbi-riscv32-virt-fw_jump.bin
> -share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
> -share/qemu/opensbi-riscv64-virt-fw_jump.bin
> +share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
> +share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
> +share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
> +share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
>  share/qemu/palcode-clipper
>  share/qemu/petalogix-ml605.dtb
>  share/qemu/petalogix-s3adsp1800.dtb
> @@ -375,6 +387,7 @@ share/qemu/pxe-ne2k_pci.rom
>  share/qemu/pxe-pcnet.rom
>  share/qemu/pxe-rtl8139.rom
>  share/qemu/pxe-virtio.rom
> +share/qemu/qboot.rom
>  share/qemu/qemu-nsis.bmp
>  share/qemu/qemu_vga.ndrv
>  share/qemu/s390-ccw.img
>

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: QEMU 5.2.0

Brad Smith-14
On 2/22/2021 7:13 AM, Antoine Jacoutot wrote:
> Why is this needed?

The build system uses it.