- updated to 9.2.1

diff --git a/qemu-linux-mount.patch b/qemu-linux-mount.patch
index 50c7fb59c25eb7546c2739a5dd935f955af30f11..e023a279a0f0cc23a56d9a8d8db088b9bb4c2867 100644 (file)
--- a/qemu-linux-mount.patch
+++ b/qemu-linux-mount.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur qemu-9.2.1.orig/linux-user/syscall.c qemu-9.2.1/linux-user/syscall.c
+--- qemu-9.2.1.orig/linux-user/syscall.c       2025-02-20 00:19:08.583921231 +0100
++++ qemu-9.2.1/linux-user/syscall.c    2025-02-20 00:19:24.756128751 +0100
+@@ -33,6 +33,7 @@
  #include <sys/msg.h>
  #include <sys/wait.h>
  #include <sys/mount.h>

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
deleted file mode 100644 (file)
index 0a05bf9..0000000
--- a/qemu-xattr.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur qemu-8.1.3.orig/fsdev/virtfs-proxy-helper.c qemu-8.1.3/fsdev/virtfs-proxy-helper.c
---- qemu-8.1.3.orig/fsdev/virtfs-proxy-helper.c        2023-12-14 23:23:20.468721086 +0100
-+++ qemu-8.1.3/fsdev/virtfs-proxy-helper.c     2023-12-14 23:28:45.851876342 +0100
-@@ -15,6 +15,7 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qemu/xattr.h"
- #include <glib/gstdio.h>
- #include <sys/resource.h>
- #include <getopt.h>
-@@ -28,7 +29,6 @@
- #endif
- #include <cap-ng.h>
- #include "qemu/sockets.h"
--#include "qemu/xattr.h"
- #include "9p-iov-marshal.h"
- #include "hw/9pfs/9p-proxy.h"
- #include "hw/9pfs/9p-util.h"

diff --git a/qemu.spec b/qemu.spec
index 37eed92b847c079042bc1ee8e6b0db528a730c67..929719e45deb5bf533ebf172919f0a79efb72f02 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -46,12 +46,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       9.1.2
+Version:       9.2.1
 Release:       1
 License:       GPL v2, BSD (edk2 firmware files)
 Group:         Applications/Emulators
 Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz
-# Source0-md5: ea4bb735d60ad3392875f7cd48e551af
+# Source0-md5: c33f4ef002f3d8d73f07079c9b4a157b
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -65,7 +65,6 @@ Source12:     99-%{name}-guest-agent.rules
 Source13:      %{name}-guest-agent.init
 Source14:      %{name}-guest-agent.logrotate
 Patch0:                %{name}-cflags.patch
-Patch2:                %{name}-xattr.patch
 Patch3:                libjpeg-boolean.patch
 Patch5:                %{name}-u2f-emu.patch
 Patch6:                %{name}-linux-mount.patch
@@ -195,7 +194,6 @@ Requires:   %{name}-system-aarch64 = %{version}-%{release}
 Requires:      %{name}-system-alpha = %{version}-%{release}
 Requires:      %{name}-system-arm = %{version}-%{release}
 Requires:      %{name}-system-avr = %{version}-%{release}
-Requires:      %{name}-system-cris = %{version}-%{release}
 Requires:      %{name}-system-hppa = %{version}-%{release}
 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
@@ -295,6 +293,7 @@ Provides:   group(qemu)
 Provides:      user(qemu)
 Obsoletes:     qemu-kvm-common < 2
 Obsoletes:     qemu-module-block-archipelago < 2.9.0
+Obsoletes:     qemu-system-cris < 9.2.0
 Obsoletes:     qemu-system-lm32 < 5.2
 Obsoletes:     qemu-system-moxie < 6.1
 Obsoletes:     qemu-system-unicore32 < 5.2
@@ -471,26 +470,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem AVR.
 
-%package system-cris
-Summary:       QEMU system emulator for CRIS
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem CRIS
-Group:         Applications/Emulators
-Requires:      %{name}-common = %{version}-%{release}
-%systempkg_req
-Obsoletes:     qemu-kvm-system-cris < 2
-
-%description system-cris
-QEMU is a generic and open source processor emulator which achieves a
-good emulation speed by using dynamic translation.
-
-This package provides the system emulator with CRIS CPU.
-
-%description system-cris -l pl.UTF-8
-QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
-dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
-
-Ten pakiet zawiera emulator systemu z procesorem CRIS.
-
 %package system-hppa
 Summary:       QEMU system emulator for HP/PA
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem HP/PA
@@ -1013,7 +992,6 @@ Pliki nagłówkowe biblioteki vfio-user.
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
@@ -1274,7 +1252,6 @@ fi
 %if %{with virgl}
 %attr(755,root,root) %{_libexecdir}/vhost-user-gpu
 %endif
-%attr(755,root,root) %{_libexecdir}/virtfs-proxy-helper
 %dir %{_libdir}/%{name}
 # modules without too many external dependencies
 %attr(755,root,root) %{_libdir}/%{name}/block-blkio.so
@@ -1331,7 +1308,6 @@ fi
 %{_iconsdir}/hicolor/scalable/apps/qemu.svg
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/qemu-storage-daemon.1*
-%{_mandir}/man1/virtfs-proxy-helper.1*
 %{_mandir}/man7/qemu-block-drivers.7*
 %{_mandir}/man7/qemu-cpu-models.7*
 %{_mandir}/man7/qemu-qmp-ref.7*
@@ -1361,7 +1337,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
-%attr(755,root,root) %{_bindir}/qemu-cris
 %attr(755,root,root) %{_bindir}/qemu-hexagon
 %attr(755,root,root) %{_bindir}/qemu-hppa
 %attr(755,root,root) %{_bindir}/qemu-i386
@@ -1400,7 +1375,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-alpha-static
 %attr(755,root,root) %{_bindir}/qemu-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
-%attr(755,root,root) %{_bindir}/qemu-cris-static
 %attr(755,root,root) %{_bindir}/qemu-hexagon-static
 %attr(755,root,root) %{_bindir}/qemu-hppa-static
 %attr(755,root,root) %{_bindir}/qemu-i386-static
@@ -1455,10 +1429,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-avr
 
-%files system-cris
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-cris
-
 %files system-hppa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-hppa
@@ -1481,6 +1451,9 @@ 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
+%{_datadir}/%{name}/edk2-loongarch64-code.fd
+%{_datadir}/%{name}/edk2-loongarch64-vars.fd
+%{_datadir}/%{name}/firmware/60-edk2-loongarch64.json
 
 %files system-or1k
 %defattr(644,root,root,755)
@@ -1514,6 +1487,7 @@ fi
 %{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin
 %{_datadir}/%{name}/edk2-riscv-code.fd
 %{_datadir}/%{name}/edk2-riscv-vars.fd
+%{_datadir}/%{name}/firmware/60-edk2-riscv64.json
 
 %files system-rx
 %defattr(644,root,root,755)
@@ -1523,7 +1497,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
 %{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-netboot.img
 
 %files system-sh4
 %defattr(644,root,root,755)