- merged two fixes from PLD, dropped test modules, dropped libslirp

  (merged too much)

diff --git a/qemu-linux-mount.patch b/qemu-linux-mount.patch
new file mode 100644 (file)
index 0000000..50c7fb5
--- /dev/null
+++ b/qemu-linux-mount.patch
@@ -0,0 +1,11 @@
+diff -ur qemu-8.0.3.orig/linux-user/syscall.c qemu-8.0.3/linux-user/syscall.c
+--- qemu-8.0.3.orig/linux-user/syscall.c       2023-07-22 23:34:39.540061815 +0200
++++ qemu-8.0.3/linux-user/syscall.c    2023-07-22 23:35:51.628085621 +0200
+@@ -31,6 +31,7 @@
+ #include <sys/msg.h>
+ #include <sys/wait.h>
+ #include <sys/mount.h>
++#define _LINUX_MOUNT_H 1
+ #include <sys/file.h>
+ #include <sys/fsuid.h>
+ #include <sys/personality.h>

diff --git a/qemu-u2f-emu.patch b/qemu-u2f-emu.patch
new file mode 100644 (file)
index 0000000..265d420
--- /dev/null
+++ b/qemu-u2f-emu.patch
@@ -0,0 +1,12 @@
+diff -ur qemu-8.0.3.orig/hw/usb/u2f-emulated.c qemu-8.0.3/hw/usb/u2f-emulated.c
+--- qemu-8.0.3.orig/hw/usb/u2f-emulated.c      2023-07-22 23:31:29.880368251 +0200
++++ qemu-8.0.3/hw/usb/u2f-emulated.c   2023-07-22 23:32:27.161181758 +0200
+@@ -31,7 +31,7 @@
+ #include "hw/usb.h"
+ #include "hw/qdev-properties.h"
+ 
+-#include <u2f-emu/u2f-emu.h>
++#include <u2f-emu.h>
+ 
+ #include "u2f.h"
+ 

diff --git a/qemu.spec b/qemu.spec
index 6a74a06f639f74d5e37948434498d9674ee2e22d..2689500ec2fc0a953ffebb5f434594daa539e717 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -65,6 +65,8 @@ Patch0:               %{name}-no-fortify.patch
 Patch2:                %{name}-execve.patch
 Patch3:                %{name}-xattr.patch
 Patch4:                libjpeg-boolean.patch
+Patch5:                %{name}-u2f-emu.patch
+Patch6:                %{name}-linux-mount.patch
 URL:           https://www.qemu.org/
 %{?with_opengl:BuildRequires:  Mesa-libgbm-devel}
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
@@ -107,7 +109,6 @@ BuildRequires:      libpng-devel >= 2:1.6.34
 %{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0}
 BuildRequires: libselinux-devel
 BuildRequires: libssh-devel >= 0.8.7
-BuildRequires: libslirp-devel >= 4.1.0
 # for tests only
 #BuildRequires:        libtasn1-devel
 BuildRequires: libu2f-emu-devel
@@ -212,7 +213,6 @@ Requires:   libpng >= 2:1.6.34 \
 %if %{with seccomp} \
 Requires:      libseccomp >= 2.3.0 \
 %endif \
-Requires:      libslirp >= 4.1.0 \
 Requires:      liburing >= 0.3 \
 Requires:      libusb >= 1.0.22 \
 Requires:      pixman >= 0.21.8 \
@@ -994,6 +994,8 @@ Sondy systemtap/dtrace dla QEMU.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap
 
@@ -1058,7 +1060,6 @@ build dynamic \
        %{__enable_disable rdma} \
        %{__enable_disable sdl} \
        %{__enable_disable seccomp} \
-       --enable-slirp=system \
        %{__enable_disable spice} \
        %{__enable_disable smartcard} \
        %{__enable_disable snappy} \
@@ -1391,20 +1392,17 @@ fi
 %files system-aarch64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-aarch64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-aarch64.so
 %{_datadir}/%{name}/edk2-aarch64-code.fd
 %{_datadir}/%{name}/firmware/60-edk2-aarch64.json
 
 %files system-alpha
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-alpha
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-alpha.so
 %{_datadir}/%{name}/palcode-clipper
 
 %files system-arm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-arm
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-arm.so
 %{_datadir}/%{name}/edk2-arm-code.fd
 %{_datadir}/%{name}/edk2-arm-vars.fd
 %{_datadir}/%{name}/firmware/60-edk2-arm.json
@@ -1413,34 +1411,27 @@ fi
 %files system-avr
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-avr
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-avr.so
 %files system-cris
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-cris.so
 
 %files system-hppa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-hppa
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-hppa.so
 %{_datadir}/%{name}/hppa-firmware.img
 
 %files system-loongarch
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-loongarch64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-loongarch64.so
 
 %files system-m68k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-m68k
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-m68k.so
 
 %files system-microblaze
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-microblaze
 %attr(755,root,root) %{_bindir}/qemu-system-microblazeel
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-microblaze.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-microblazeel.so
 
 %files system-mips
 %defattr(644,root,root,755)
@@ -1448,27 +1439,19 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mipsel
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips64.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips64el.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mipsel.so
 
 %files system-nios2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-nios2
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-nios2.so
 
 %files system-or1k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or1k
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-or1k.so
 
 %files system-ppc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-ppc
 %attr(755,root,root) %{_bindir}/qemu-system-ppc64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-ppc.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-ppc64.so
 %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/canyonlands.dtb
 %{_datadir}/%{name}/openbios-ppc
@@ -1483,24 +1466,20 @@ fi
 %files system-riscv32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-riscv32
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv32.so
 %{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.bin
 
 %files system-riscv64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-riscv64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv64.so
 %{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin
 
 %files system-rx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-rx
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-rx.so
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-s390x.so
 %{_datadir}/%{name}/s390-ccw.img
 %{_datadir}/%{name}/s390-netboot.img
 
@@ -1508,15 +1487,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sh4
 %attr(755,root,root) %{_bindir}/qemu-system-sh4eb
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sh4.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sh4eb.so
 
 %files system-sparc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sparc
 %attr(755,root,root) %{_bindir}/qemu-system-sparc64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sparc.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sparc64.so
 %{_datadir}/%{name}/QEMU,cgthree.bin
 %{_datadir}/%{name}/QEMU,tcx.bin
 %{_datadir}/%{name}/openbios-sparc32
@@ -1525,14 +1500,11 @@ fi
 %files system-tricore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-tricore
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-tricore.so
 
 %files system-x86
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-i386
 %attr(755,root,root) %{_bindir}/qemu-system-x86_64
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-i386.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-x86_64.so
 %attr(755,root,root) %{_libdir}/%{name}/accel-tcg-i386.so
 %attr(755,root,root) %{_libdir}/%{name}/accel-tcg-x86_64.so
 %ifarch %{ix86} %{x8664} x32
@@ -1588,8 +1560,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-xtensa
 %attr(755,root,root) %{_bindir}/qemu-system-xtensaeb
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-xtensa.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-xtensaeb.so
 
 %files guest-agent
 %defattr(644,root,root,755)