emulators/qemu: Update version 7.2.1=>8.0.0

Changelog: https://wiki.qemu.org/ChangeLog/8.0

7 files changed, 25 insertions, 43 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index a441409b8189..2adb2f7ce328 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qemu
-PORTVERSION=	7.2.1
+PORTVERSION=	8.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -28,9 +28,9 @@ LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
 FLAVORS=			default nox11 tools guestagent
 FLAVOR?=			${FLAVORS:[1]}
 default_CONFLICTS_INSTALL=	qemu-devel qemu-nox11 qemu-tools qemu-utils \
-				qemu6* qemu70*
+				qemu6* qemu7*
 nox11_PKGNAMESUFFIX=		-nox11
-nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6* qemu70* qemu-guest-agent
+nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6* qemu7* qemu-guest-agent
 nox11_COMMENT=			(without X11)
 tools_PKGNAMESUFFIX=		-tools
 tools_COMMENT=			(tools only)
@@ -43,7 +43,7 @@ guestagent_COMMENT=			(guest agent)
 guestagent_DESCR=		${.CURDIR}/pkg-descr-ga
 guestagent_PLIST=		${.CURDIR}/pkg-plist-ga
 guestagent_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-tools qemu-utils qemu6* \
-				qemu70* qemu-guest-agent
+				qemu7* qemu-guest-agent
 
 USES=		cpe gmake gnome ninja perl5 pkgconfig python:build tar:xz
 USE_GNOME=	glib20
@@ -201,6 +201,7 @@ X11_USE=			GNOME=gdkpixbuf2 \
 X11_CONFIGURE_ENABLE=		sdl
 .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
+X86_TARGETS_LIB_DEPENDS_OFF=	libdw.so:devel/elfutils
 X86_TARGETS_USES_OFF=		xorg
 X86_TARGETS_USE_OFF=		XORG=pixman,x11
 X86_TARGETS_CONFIGURE_ON=	--target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user'
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index a2a612efc879..768ad070ecb5 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681497374
-SHA256 (qemu/7.2.1/qemu-7.2.1.tar.xz) = 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b
-SIZE (qemu/7.2.1/qemu-7.2.1.tar.xz) = 122400592
+TIMESTAMP = 1683303520
+SHA256 (qemu/8.0.0/qemu-8.0.0.tar.xz) = bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0
+SIZE (qemu/8.0.0/qemu-8.0.0.tar.xz) = 127835148
diff --git a/emulators/qemu/files/patch-block_export_fuse.c b/emulators/qemu/files/patch-block_export_fuse.c
index 5fbb0dd9a040..9db53a560cf8 100644
--- a/emulators/qemu/files/patch-block_export_fuse.c
+++ b/emulators/qemu/files/patch-block_export_fuse.c
@@ -1,6 +1,6 @@
---- block/export/fuse.c.orig	2022-04-22 18:57:58 UTC
+--- block/export/fuse.c.orig	2023-04-19 16:31:47 UTC
 +++ block/export/fuse.c
-@@ -637,12 +637,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t 
+@@ -638,12 +638,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t 
          return;
      }
  
@@ -13,7 +13,7 @@
      if (!mode) {
          /* We can only fallocate at the EOF with a truncate */
          if (offset < blk_len) {
-@@ -662,44 +656,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t 
+@@ -663,53 +657,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t 
          ret = fuse_do_truncate(exp, offset + length, true,
                                 PREALLOC_MODE_FALLOC);
      }
@@ -27,7 +27,16 @@
 -        do {
 -            int size = MIN(length, BDRV_REQUEST_MAX_BYTES);
 -
--            ret = blk_pdiscard(exp->common.blk, offset, size);
+-            ret = blk_pwrite_zeroes(exp->common.blk, offset, size,
+-                                    BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK);
+-            if (ret == -ENOTSUP) {
+-                /*
+-                 * fallocate() specifies to return EOPNOTSUPP for unsupported
+-                 * operations
+-                 */
+-                ret = -EOPNOTSUPP;
+-            }
+-
 -            offset += size;
 -            length -= size;
 -        } while (ret == 0 && length > 0);
diff --git a/emulators/qemu/files/patch-meson.build b/emulators/qemu/files/patch-meson.build
index 1ada4462a416..a7eac38afeff 100644
--- a/emulators/qemu/files/patch-meson.build
+++ b/emulators/qemu/files/patch-meson.build
@@ -1,6 +1,6 @@
---- meson.build.orig	2022-12-14 16:28:45 UTC
+--- meson.build.orig	2023-04-19 16:31:47 UTC
 +++ meson.build
-@@ -2719,14 +2719,10 @@ if have_system
+@@ -2766,14 +2766,10 @@ if have_system
    fdt_opt = get_option('fdt')
    if fdt_opt in ['enabled', 'auto', 'system']
      have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')
diff --git a/emulators/qemu/files/patch-util_meson.build b/emulators/qemu/files/patch-util_meson.build
index 135b2ee3f156..f8f4171d6783 100644
--- a/emulators/qemu/files/patch-util_meson.build
+++ b/emulators/qemu/files/patch-util_meson.build
@@ -1,6 +1,6 @@
---- util/meson.build.orig	2022-12-14 16:28:45 UTC
+--- util/meson.build.orig	2023-04-19 16:31:47 UTC
 +++ util/meson.build
-@@ -97,10 +97,6 @@ if have_block
+@@ -99,10 +99,6 @@ if have_block
    util_ss.add(files('readline.c'))
    util_ss.add(files('throttle.c'))
    util_ss.add(files('timed-average.c'))
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index 54a7ebc05d6d..ac6e871ff11c 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -71,33 +71,6 @@ FreeBSD host notes
   and you are not running qemu as root, then mountd(8) on the exporting box
   needs to be run with -n in order to accept requests from ports >= 1024.
 
-- (not FreeBSD-specific:) There have been reports of qcow2 corruption with (at
-  least) win2k guests on recent kvm (which uses similar qcow2 code than qemu
-  now, see this thread:
-
-	http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg00713.html -
-
-  the consensus on that thread seems to be that qcow(2) code has always been
-  experimental and you should use raw images if you want reliability; raw is
-  also usually faster.)  You should be able to migrate existing images to raw
-  using qemu-img(1)'s convert function; raw doesn't support advanced features
-  like snapshots tho.  [a few important qcow2 bugfixed have been committed in
-  the meantime so this _might_ be less of an issue now; and meanwhile there
-  also is the new qed format - I don't know how stable that one is.]
-
-- (also not FreeBSD-specific:)  It is recommended to pass raw images using the
-  new -drive syntax, specifying format=raw explicitly in order to avoid
-  malicious guests being able to exploit the format autodetection thats
-  otherwise getting used.  (Not that you should run malicious guests anyway,
-  but this eleminates at least a known attack vector.)
-
-- qemu now has improved physical cdrom support, but still there is at
-  least one known problem: you need to have the guest eject the disc if you
-  want to change it/take it out, or otherwise the guest may continue using
-  state (like size) of the old disc.  (You can also do like `change ide1-cd0
-  /dev/acd0' in the monitor after taking out the disc if a guest cannot eject
-  it itself.)
-
 EOM
 }
 ]
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index 3945e88c4478..336c62f4395e 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -147,7 +147,6 @@ include/qemu-plugin.h
 %%DATADIR%%/vgabios-stdvga.bin
 %%DATADIR%%/vgabios-virtio.bin
 %%DATADIR%%/vgabios-vmware.bin
-%%DATADIR%%/sgabios.bin
 %%DATADIR%%/skiboot.lid
 %%DATADIR%%/trace-events-all
 %%DATADIR%%/petalogix-s3adsp1800.dtb