- updated to 6.1.0

diff --git a/qemu.spec b/qemu.spec
index 825d575659ac4bf19a9c0d624176b739dd500809..f8b9ff5441b49f0f84f98f37d9787188f8cd016f 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -43,12 +43,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       6.0.0
+Version:       6.1.0
 Release:       1
 License:       GPL v2, BSD (edk2 firmware files)
 Group:         Applications/Emulators
 Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz
-# Source0-md5: cce185dc0119546e395909e8a71a75bb
+# Source0-md5: 47f776c276a24f42108ba512a2aa3013
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -166,7 +166,6 @@ Requires:   %{name}-system-hppa = %{version}-%{release}
 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
-Requires:      %{name}-system-moxie = %{version}-%{release}
 Requires:      %{name}-system-nios2 = %{version}-%{release}
 Requires:      %{name}-system-or1k = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
@@ -257,6 +256,7 @@ Provides:   user(qemu)
 Obsoletes:     qemu-kvm-common
 Obsoletes:     qemu-module-block-archipelago < 2.9.0
 Obsoletes:     qemu-system-lm32
+Obsoletes:     qemu-system-moxie
 Obsoletes:     qemu-system-unicore32
 Conflicts:     qemu < 1.0-2
 
@@ -273,6 +273,20 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 Ten pakiet udostępnia wspólne pliki wymagane przez wszystkie
 środowiska QEMU.
 
+%package devel
+Summary:       Development files for programs using qemu
+Summary(pl.UTF-8):     Pliki programistyczne do programów wykorzystujących qemu
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files needed for developing programs
+using the QEMU.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów
+wykorzystujących QEMU.
+
 %package img
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków
@@ -507,25 +521,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem MIPS.
 
-%package system-moxie
-Summary:       QEMU system emulator for Moxie
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Moxie
-Group:         Applications/Emulators
-Requires:      %{name}-common = %{version}-%{release}
-%systempkg_req
-
-%description system-moxie
-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 Moxie CPU.
-
-%description system-moxie -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 Moxie.
-
 %package system-nios2
 Summary:       QEMU system emulator for Nios II
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Nios II
@@ -1176,10 +1171,14 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/chardev-spice.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-display-qxl.so
 %endif
-%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-gl.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci-gl.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga-gl.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-usb-host.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-usb-smartcard.so
 %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
@@ -1216,6 +1215,10 @@ fi
 %{_mandir}/man8/qemu-pr-helper.8*
 %{_docdir}/qemu
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/qemu-plugin.h
+
 %files img
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-img
@@ -1302,17 +1305,20 @@ 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
@@ -1321,24 +1327,29 @@ 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-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)
@@ -1346,23 +1357,27 @@ 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
-
-%files system-moxie
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-moxie
+%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
@@ -1377,22 +1392,26 @@ 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
 %{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.elf
 
 %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
 %{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.elf
 
 %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
 
@@ -1400,11 +1419,15 @@ 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
@@ -1413,11 +1436,16 @@ 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
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/kvm.conf
 /lib/udev/rules.d/80-kvm.rules
@@ -1469,6 +1497,8 @@ 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)

diff --git a/x32.patch b/x32.patch
index 54e6a61f51738b66d2c7d9f0c095d8741b49e8c1..c0dec10090e9f34e7cad5564024e0ad549c110c5 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -7,16 +7,5 @@
 -if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
 +if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \
          test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \
-         test "$softmmu" = yes ; then
+         test "$targetos" != "Haiku" && test "$softmmu" = yes ; then
      # Different host OS linkers have different ideas about the name of the ELF
---- qemu-2.6.0/include/qemu/atomic.h~  2016-07-17 18:37:57.000000000 +0200
-+++ qemu-2.6.0/include/qemu/atomic.h   2016-07-17 18:38:33.485893530 +0200
-@@ -20,7 +20,7 @@
- /* Compiler barrier */
- #define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
- 
--#ifdef __ATOMIC_RELAXED
-+#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)
- /* For C11 atomic ops */
- 
- /* Manual memory barriers