diff --git a/block-io_uring-revert-Use-io_uring_regis.patch b/block-io_uring-revert-Use-io_uring_regis.patch new file mode 100644 index 00000000..153c2535 --- /dev/null +++ b/block-io_uring-revert-Use-io_uring_regis.patch @@ -0,0 +1,79 @@ +From: Sam Li +Date: Sat, 24 Sep 2022 22:48:15 +0800 +Subject: block/io_uring: revert "Use io_uring_register_ring_fd() to skip fd + operations" + +Git-commit: 0000000000000000000000000000000000000000 +References: bsc#1204082 + +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1193 + +The commit "Use io_uring_register_ring_fd() to skip fd operations" broke +when booting a guest with iothread and io_uring. That is because the +io_uring_register_ring_fd() call is made from the main thread instead of +IOThread where io_uring_submit() is called. It can not be guaranteed +to register the ring fd in the correct thread or unregister the same ring +fd if the IOThread is disabled. This optimization is not critical so we +will revert previous commit. + +This reverts commit e2848bc574fe2715c694bf8fe9a1ba7f78a1125a +and 77e3f038af1764983087e3551a0fde9951952c4d. + +Signed-off-by: Sam Li +Signed-off-by: Dario Faggioli +--- + block/io_uring.c | 13 +------------ + meson.build | 1 - + 2 files changed, 1 insertion(+), 13 deletions(-) + +diff --git a/block/io_uring.c b/block/io_uring.c +index a1760152e0581c279e22b1c3a8d0..973e15d87693370dd3388f511962 100644 +--- a/block/io_uring.c ++++ b/block/io_uring.c +@@ -11,7 +11,6 @@ + #include "qemu/osdep.h" + #include + #include "block/aio.h" +-#include "qemu/error-report.h" + #include "qemu/queue.h" + #include "block/block.h" + #include "block/raw-aio.h" +@@ -19,7 +18,6 @@ + #include "qapi/error.h" + #include "trace.h" + +- + /* io_uring ring size */ + #define MAX_ENTRIES 128 + +@@ -432,17 +430,8 @@ LuringState *luring_init(Error **errp) + } + + ioq_init(&s->io_q); +-#ifdef CONFIG_LIBURING_REGISTER_RING_FD +- if (io_uring_register_ring_fd(&s->ring) < 0) { +- /* +- * Only warn about this error: we will fallback to the non-optimized +- * io_uring operations. +- */ +- warn_report("failed to register linux io_uring ring file descriptor"); +- } +-#endif +- + return s; ++ + } + + void luring_cleanup(LuringState *s) +diff --git a/meson.build b/meson.build +index 6641e86c0107906bb07d6b35d54a..265fea0648a8b651306deae60c0f 100644 +--- a/meson.build ++++ b/meson.build +@@ -1805,7 +1805,6 @@ config_host_data.set('CONFIG_LIBNFS', libnfs.found()) + config_host_data.set('CONFIG_LIBSSH', libssh.found()) + config_host_data.set('CONFIG_LINUX_AIO', libaio.found()) + config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found()) +-config_host_data.set('CONFIG_LIBURING_REGISTER_RING_FD', cc.has_function('io_uring_register_ring_fd', prefix: '#include ', dependencies:linux_io_uring)) + config_host_data.set('CONFIG_LIBPMEM', libpmem.found()) + config_host_data.set('CONFIG_NUMA', numa.found()) + config_host_data.set('CONFIG_OPENGL', opengl.found()) diff --git a/bundles.tar.xz b/bundles.tar.xz index f94d6061..075f305f 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04241a8192981377e1baa044d408dd6f38295f292af74a34a247d14f2aa1845f -size 42692 +oid sha256:9f317be581f7c79828e97405398736903b44f3f132fe075201fca2975142658b +size 43516 diff --git a/pkg-split.txt b/pkg-split.txt deleted file mode 100644 index fdc4190c..00000000 --- a/pkg-split.txt +++ /dev/null @@ -1,8 +0,0 @@ -This file is provided to handle package splits in the case where functionality -split out into a new, optional package does not (otherwise) have associated, -installed files. The split out package provides this previously installed file -simply to help the package resolver identify the packages needed to maintain -current functionality. - -If you determine the package providing this file is not needed, it may be -uninstalled. diff --git a/qemu.changes b/qemu.changes index aba4c561..a6b67067 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Oct 7 12:35:50 UTC 2022 - Dario Faggioli + +- Fixes bsc#1204082 +* Patches added: + block-io_uring-revert-Use-io_uring_regis.patch + +Wed Oct 5 15:57:27 UTC 2022 - Dario Faggioli + +- Due to change in where some documentation files are, if + qemu-guest-agent is installed, we need to make sure we update it + to our version (bsc#1203995) + +------------------------------------------------------------------- +Wed Oct 5 15:43:56 UTC 2022 - Dario Faggioli + +- The links in the forsplit dirs, in each subpackage, born to deal with + package & subpackage splitting, are not really used. In fact, they're + "Provides:"-ed by a bunch of subpackages, but there's no "Requires:" + for any of them. Let's just get rid of them. + ------------------------------------------------------------------- Tue Oct 4 13:49:43 UTC 2022 - Dario Faggioli diff --git a/qemu.spec b/qemu.spec index 5dc53c91..172fc8e2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -149,8 +149,7 @@ Source13: supported.s390.txt Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc -Source201: pkg-split.txt -Source202: DSDT.pcie +Source201: DSDT.pcie Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -192,6 +191,7 @@ Patch00029: linux-user-add-more-compat-ioctl-definit.patch Patch00030: linux-user-remove-conditionals-for-many-.patch Patch00031: meson-enforce-a-minimum-Linux-kernel-hea.patch Patch00032: linux-user-drop-conditionals-for-obsolet.patch +Patch00033: block-io_uring-revert-Use-io_uring_regis.patch # Patches applied in roms/seabios/: Patch01000: seabios-switch-to-python3-as-needed.patch Patch01001: enable-cross-compilation-on-ARM.patch @@ -380,6 +380,9 @@ Requires(post): coreutils %ifarch s390x Recommends: qemu-hw-s390x-virtio-gpu-ccw %else +# Due to change in where some documentation files are, if qemu-guest-agent +# is installed, we need to make sure we update it to our version. +Requires: (qemu-guest-agent = %{qemuver} if qemu-guest-agent) Recommends: qemu-hw-display-qxl Recommends: qemu-hw-display-virtio-gpu Recommends: qemu-hw-display-virtio-gpu-pci @@ -483,7 +486,6 @@ This package acts as an umbrella package to the other QEMU sub-packages. %dir %_datadir/icons/hicolor/*/apps %dir %_datadir/%name %dir %_datadir/%name/firmware -%dir %_datadir/%name/forsplits %dir %_datadir/%name/vhost-user %dir %_sysconfdir/%name %dir %_sysconfdir/%name/firmware @@ -507,10 +509,6 @@ This package acts as an umbrella package to the other QEMU sub-packages. %_datadir/icons/hicolor/256x256/apps/qemu.png %_datadir/icons/hicolor/512x512/apps/qemu.png %_datadir/icons/hicolor/scalable/apps/qemu.svg -%_datadir/%name/forsplits/17 -%_datadir/%name/forsplits/18 -%_datadir/%name/forsplits/19 -%_datadir/%name/forsplits/pkg-split.txt %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -795,7 +793,6 @@ Summary: Spice based audio support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/05 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -804,8 +801,6 @@ This package contains a module for Spice based audio support for QEMU. %files audio-spice %defattr(-, root, root) -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/05 %dir %_libdir/%name %_libdir/%name/audio-spice.so @@ -926,7 +921,6 @@ Summary: Baum braille chardev support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/00 %{qemu_module_conflicts} %description chardev-baum @@ -935,8 +929,6 @@ This package contains a module for baum braille chardev support for QEMU. %files chardev-baum %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/00 %dir %_libdir/%name %_libdir/%name/chardev-baum.so @@ -945,7 +937,6 @@ Summary: Spice vmc and port chardev support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/08 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -955,8 +946,6 @@ This package contains a module for Spice chardev support for QEMU. %files chardev-spice %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/08 %dir %_libdir/%name %_libdir/%name/chardev-spice.so @@ -965,7 +954,6 @@ Summary: QXL display support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/01 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -975,8 +963,6 @@ This package contains a module for QXL display support for QEMU. %files hw-display-qxl %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/01 %dir %_libdir/%name %_libdir/%name/hw-display-qxl.so @@ -985,7 +971,6 @@ Summary: Virtio GPU display support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/04 %{qemu_module_conflicts} %description hw-display-virtio-gpu @@ -994,8 +979,6 @@ This package contains a module for Virtio GPU display support for QEMU. %files hw-display-virtio-gpu %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/04 %_libdir/%name/hw-display-virtio-gpu.so %_libdir/%name/hw-display-virtio-gpu-gl.so @@ -1005,7 +988,6 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: qemu-hw-display-virtio-gpu -Provides: %name:%_datadir/%name/forsplits/11 %{qemu_module_conflicts} %description hw-display-virtio-gpu-pci @@ -1014,8 +996,6 @@ This package contains a module providing the virtio gpu pci device for QEMU. %files hw-display-virtio-gpu-pci %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/11 %dir %_libdir/%name %_libdir/%name/hw-display-virtio-gpu-pci.so %_libdir/%name/hw-display-virtio-gpu-pci-gl.so @@ -1025,7 +1005,6 @@ Summary: Virtio vga device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/12 %{qemu_module_conflicts} %description hw-display-virtio-vga @@ -1034,8 +1013,6 @@ This package contains a module providing the virtio vga device for QEMU. %files hw-display-virtio-vga %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/12 %dir %_libdir/%name %_libdir/%name/hw-display-virtio-vga.so %_libdir/%name/hw-display-virtio-vga-gl.so @@ -1046,7 +1023,6 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: qemu-hw-display-virtio-gpu -Provides: %name:%_datadir/%name/forsplits/13 %{qemu_module_conflicts} %description hw-s390x-virtio-gpu-ccw @@ -1056,8 +1032,6 @@ QEMU. %files hw-s390x-virtio-gpu-ccw %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/13 %dir %_libdir/%name %_libdir/%name/hw-s390x-virtio-gpu-ccw.so @@ -1066,7 +1040,6 @@ Summary: USB redirection support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/02 %{qemu_module_conflicts} %description hw-usb-redirect @@ -1075,8 +1048,6 @@ This package contains a module for USB redirection support for QEMU. %files hw-usb-redirect %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/02 %dir %_libdir/%name %_libdir/%name/hw-usb-redirect.so @@ -1085,7 +1056,6 @@ Summary: USB smartcard support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/03 %{qemu_module_conflicts} %description hw-usb-smartcard @@ -1094,8 +1064,6 @@ This package contains a modules for USB smartcard support for QEMU. %files hw-usb-smartcard %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/03 %dir %_libdir/%name %_libdir/%name/hw-usb-smartcard.so @@ -1104,7 +1072,6 @@ Summary: USB passthrough driver support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/14 %{qemu_module_conflicts} %description hw-usb-host @@ -1113,8 +1080,6 @@ This package contains a modules for USB passthrough driver for QEMU. %files hw-usb-host %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/14 %dir %_libdir/%name %_libdir/%name/hw-usb-host.so @@ -1169,7 +1134,6 @@ Summary: OpenGL based UI support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/10 %{qemu_module_conflicts} %description ui-opengl @@ -1178,8 +1142,6 @@ This package contains a module for doing OpenGL based UI for QEMU. %files ui-opengl %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/10 %dir %_libdir/%name %_libdir/%name/ui-egl-headless.so %_libdir/%name/ui-opengl.so @@ -1206,7 +1168,6 @@ Summary: Core Spice support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/09 Requires: qemu-ui-opengl # This next Requires is only since virt-manager expects audio support Requires: qemu-audio-spice @@ -1218,8 +1179,6 @@ This package contains a module with core Spice support for QEMU. %files ui-spice-core %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/09 %dir %_libdir/%name %_libdir/%name/ui-spice-core.so @@ -1290,7 +1249,6 @@ Summary: Inter-VM Shared Memory Tools for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/07 %description ivshmem-tools This package contains a sample shared memory client and server which utilize @@ -1301,8 +1259,6 @@ code. %files ivshmem-tools %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/07 %_bindir/ivshmem-client %_bindir/ivshmem-server @@ -1386,7 +1342,6 @@ Summary: TCG accelerator for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/15 %{qemu_module_conflicts} %description accel-tcg-x86 @@ -1398,8 +1353,6 @@ This package provides the TCG accelerator for QEMU. %files accel-tcg-x86 %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/15 %dir %_libdir/%name %_libdir/%name/accel-tcg-i386.so %_libdir/%name/accel-tcg-x86_64.so @@ -1409,7 +1362,6 @@ Summary: QTest accelerator for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/16 %{qemu_module_conflicts} %description accel-qtest @@ -1421,8 +1373,6 @@ This package provides QTest accelerator for testing QEMU. %files accel-qtest %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/16 %dir %_libdir/%name %_libdir/%name/accel-qtest-aarch64.so %_libdir/%name/accel-qtest-alpha.so @@ -1531,7 +1481,6 @@ Release: 0 BuildArch: noarch Requires(post): update-alternatives Requires(postun):update-alternatives -Provides: %name:%_datadir/%name/forsplits/06 %description skiboot Provides OPAL (OpenPower Abstraction Layer) firmware, aka skiboot, as @@ -1540,8 +1489,6 @@ traditionally packaged with QEMU. %files skiboot %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/06 %_datadir/%name/skiboot.lid %_datadir/%name/skiboot.lid.qemu %ghost %_sysconfdir/alternatives/skiboot.lid @@ -2250,12 +2197,6 @@ unlink %{buildroot}%_datadir/%name/edk2-x86_64-secure-code.fd # this was never meant for customer consumption - delete even though installed unlink %{buildroot}%_bindir/elf2dmp -install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 07 08 09 10 11 12 13 14 15 16 17 18 19 -do - ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X -done - # For PPC and x86 firmwares, there are a few extra install steps necessary. # In general, if we know that we have not built a firmware, remove it from the # install base, as the one that we have there is the upstream binary, that got @@ -2272,7 +2213,6 @@ mv %{buildroot}%_datadir/%name/skiboot.lid %{buildroot}%_datadir/%name/skiboot.l # create a dummy target for /etc/alternatives/skiboot.lid mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid -ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/06 %else for f in %{ppc_extra_firmware} ; do unlink %{buildroot}%_datadir/%name/$f @@ -2313,7 +2253,7 @@ cd %blddir # do that in the patch itself. Instead, we keep a copy of the binary in the # package sources, and put it in place now, before the tests themselves. # If that patch is removed, the following line needs to go as well. -cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ +cp %{SOURCE201} %{srcdir}/tests/data/acpi/microvm/ %if 0%{?qemu_user_space_build} # Seccomp is not supported by linux-user emulation diff --git a/qemu.spec.in b/qemu.spec.in index 97ecc103..79d46707 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -149,8 +149,7 @@ Source13: supported.s390.txt Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc -Source201: pkg-split.txt -Source202: DSDT.pcie +Source201: DSDT.pcie Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -323,6 +322,9 @@ Requires(post): coreutils %ifarch s390x Recommends: qemu-hw-s390x-virtio-gpu-ccw %else +# Due to change in where some documentation files are, if qemu-guest-agent +# is installed, we need to make sure we update it to our version. +Requires: (qemu-guest-agent = %{qemuver} if qemu-guest-agent) Recommends: qemu-hw-display-qxl Recommends: qemu-hw-display-virtio-gpu Recommends: qemu-hw-display-virtio-gpu-pci @@ -426,7 +428,6 @@ This package acts as an umbrella package to the other QEMU sub-packages. %dir %_datadir/icons/hicolor/*/apps %dir %_datadir/%name %dir %_datadir/%name/firmware -%dir %_datadir/%name/forsplits %dir %_datadir/%name/vhost-user %dir %_sysconfdir/%name %dir %_sysconfdir/%name/firmware @@ -450,10 +451,6 @@ This package acts as an umbrella package to the other QEMU sub-packages. %_datadir/icons/hicolor/256x256/apps/qemu.png %_datadir/icons/hicolor/512x512/apps/qemu.png %_datadir/icons/hicolor/scalable/apps/qemu.svg -%_datadir/%name/forsplits/17 -%_datadir/%name/forsplits/18 -%_datadir/%name/forsplits/19 -%_datadir/%name/forsplits/pkg-split.txt %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -738,7 +735,6 @@ Summary: Spice based audio support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/05 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -747,8 +743,6 @@ This package contains a module for Spice based audio support for QEMU. %files audio-spice %defattr(-, root, root) -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/05 %dir %_libdir/%name %_libdir/%name/audio-spice.so @@ -869,7 +863,6 @@ Summary: Baum braille chardev support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/00 %{qemu_module_conflicts} %description chardev-baum @@ -878,8 +871,6 @@ This package contains a module for baum braille chardev support for QEMU. %files chardev-baum %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/00 %dir %_libdir/%name %_libdir/%name/chardev-baum.so @@ -888,7 +879,6 @@ Summary: Spice vmc and port chardev support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/08 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -898,8 +888,6 @@ This package contains a module for Spice chardev support for QEMU. %files chardev-spice %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/08 %dir %_libdir/%name %_libdir/%name/chardev-spice.so @@ -908,7 +896,6 @@ Summary: QXL display support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/01 Requires: qemu-ui-spice-core %{qemu_module_conflicts} @@ -918,8 +905,6 @@ This package contains a module for QXL display support for QEMU. %files hw-display-qxl %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/01 %dir %_libdir/%name %_libdir/%name/hw-display-qxl.so @@ -928,7 +913,6 @@ Summary: Virtio GPU display support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/04 %{qemu_module_conflicts} %description hw-display-virtio-gpu @@ -937,8 +921,6 @@ This package contains a module for Virtio GPU display support for QEMU. %files hw-display-virtio-gpu %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/04 %_libdir/%name/hw-display-virtio-gpu.so %_libdir/%name/hw-display-virtio-gpu-gl.so @@ -948,7 +930,6 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: qemu-hw-display-virtio-gpu -Provides: %name:%_datadir/%name/forsplits/11 %{qemu_module_conflicts} %description hw-display-virtio-gpu-pci @@ -957,8 +938,6 @@ This package contains a module providing the virtio gpu pci device for QEMU. %files hw-display-virtio-gpu-pci %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/11 %dir %_libdir/%name %_libdir/%name/hw-display-virtio-gpu-pci.so %_libdir/%name/hw-display-virtio-gpu-pci-gl.so @@ -968,7 +947,6 @@ Summary: Virtio vga device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/12 %{qemu_module_conflicts} %description hw-display-virtio-vga @@ -977,8 +955,6 @@ This package contains a module providing the virtio vga device for QEMU. %files hw-display-virtio-vga %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/12 %dir %_libdir/%name %_libdir/%name/hw-display-virtio-vga.so %_libdir/%name/hw-display-virtio-vga-gl.so @@ -989,7 +965,6 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: qemu-hw-display-virtio-gpu -Provides: %name:%_datadir/%name/forsplits/13 %{qemu_module_conflicts} %description hw-s390x-virtio-gpu-ccw @@ -999,8 +974,6 @@ QEMU. %files hw-s390x-virtio-gpu-ccw %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/13 %dir %_libdir/%name %_libdir/%name/hw-s390x-virtio-gpu-ccw.so @@ -1009,7 +982,6 @@ Summary: USB redirection support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/02 %{qemu_module_conflicts} %description hw-usb-redirect @@ -1018,8 +990,6 @@ This package contains a module for USB redirection support for QEMU. %files hw-usb-redirect %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/02 %dir %_libdir/%name %_libdir/%name/hw-usb-redirect.so @@ -1028,7 +998,6 @@ Summary: USB smartcard support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/03 %{qemu_module_conflicts} %description hw-usb-smartcard @@ -1037,8 +1006,6 @@ This package contains a modules for USB smartcard support for QEMU. %files hw-usb-smartcard %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/03 %dir %_libdir/%name %_libdir/%name/hw-usb-smartcard.so @@ -1047,7 +1014,6 @@ Summary: USB passthrough driver support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/14 %{qemu_module_conflicts} %description hw-usb-host @@ -1056,8 +1022,6 @@ This package contains a modules for USB passthrough driver for QEMU. %files hw-usb-host %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/14 %dir %_libdir/%name %_libdir/%name/hw-usb-host.so @@ -1112,7 +1076,6 @@ Summary: OpenGL based UI support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/10 %{qemu_module_conflicts} %description ui-opengl @@ -1121,8 +1084,6 @@ This package contains a module for doing OpenGL based UI for QEMU. %files ui-opengl %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/10 %dir %_libdir/%name %_libdir/%name/ui-egl-headless.so %_libdir/%name/ui-opengl.so @@ -1149,7 +1110,6 @@ Summary: Core Spice support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/09 Requires: qemu-ui-opengl # This next Requires is only since virt-manager expects audio support Requires: qemu-audio-spice @@ -1161,8 +1121,6 @@ This package contains a module with core Spice support for QEMU. %files ui-spice-core %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/09 %dir %_libdir/%name %_libdir/%name/ui-spice-core.so @@ -1233,7 +1191,6 @@ Summary: Inter-VM Shared Memory Tools for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/07 %description ivshmem-tools This package contains a sample shared memory client and server which utilize @@ -1244,8 +1201,6 @@ code. %files ivshmem-tools %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/07 %_bindir/ivshmem-client %_bindir/ivshmem-server @@ -1329,7 +1284,6 @@ Summary: TCG accelerator for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/15 %{qemu_module_conflicts} %description accel-tcg-x86 @@ -1341,8 +1295,6 @@ This package provides the TCG accelerator for QEMU. %files accel-tcg-x86 %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/15 %dir %_libdir/%name %_libdir/%name/accel-tcg-i386.so %_libdir/%name/accel-tcg-x86_64.so @@ -1352,7 +1304,6 @@ Summary: QTest accelerator for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 -Provides: %name:%_datadir/%name/forsplits/16 %{qemu_module_conflicts} %description accel-qtest @@ -1364,8 +1315,6 @@ This package provides QTest accelerator for testing QEMU. %files accel-qtest %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/16 %dir %_libdir/%name %_libdir/%name/accel-qtest-aarch64.so %_libdir/%name/accel-qtest-alpha.so @@ -1474,7 +1423,6 @@ Release: 0 BuildArch: noarch Requires(post): update-alternatives Requires(postun):update-alternatives -Provides: %name:%_datadir/%name/forsplits/06 %description skiboot Provides OPAL (OpenPower Abstraction Layer) firmware, aka skiboot, as @@ -1483,8 +1431,6 @@ traditionally packaged with QEMU. %files skiboot %defattr(-, root, root) %dir %_datadir/%name -%dir %_datadir/%name/forsplits -%_datadir/%name/forsplits/06 %_datadir/%name/skiboot.lid %_datadir/%name/skiboot.lid.qemu %ghost %_sysconfdir/alternatives/skiboot.lid @@ -2193,12 +2139,6 @@ unlink %{buildroot}%_datadir/%name/edk2-x86_64-secure-code.fd # this was never meant for customer consumption - delete even though installed unlink %{buildroot}%_bindir/elf2dmp -install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 07 08 09 10 11 12 13 14 15 16 17 18 19 -do - ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X -done - # For PPC and x86 firmwares, there are a few extra install steps necessary. # In general, if we know that we have not built a firmware, remove it from the # install base, as the one that we have there is the upstream binary, that got @@ -2215,7 +2155,6 @@ mv %{buildroot}%_datadir/%name/skiboot.lid %{buildroot}%_datadir/%name/skiboot.l # create a dummy target for /etc/alternatives/skiboot.lid mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid -ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/06 %else for f in %{ppc_extra_firmware} ; do unlink %{buildroot}%_datadir/%name/$f @@ -2256,7 +2195,7 @@ cd %blddir # do that in the patch itself. Instead, we keep a copy of the binary in the # package sources, and put it in place now, before the tests themselves. # If that patch is removed, the following line needs to go as well. -cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ +cp %{SOURCE201} %{srcdir}/tests/data/acpi/microvm/ %if 0%{?qemu_user_space_build} # Seccomp is not supported by linux-user emulation