From 7be0fd4310fd5d64cbb1f136d8710549b9fd6b2a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 26 Sep 2023 08:48:51 -0400 Subject: [PATCH 01/21] Rebase to qemu 8.1.1 Signed-off-by: Cole Robinson --- qemu.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu.spec b/qemu.spec index 02ddf62..6f8807a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -337,11 +337,11 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 2 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.1.0 +Version: 8.1.1 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND public-domain AND CC-BY-3.0 @@ -2807,6 +2807,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Sep 26 2023 Cole Robinson - 8.1.1-1 +- Rebase to qemu 8.1.1 + * Thu Aug 24 2023 Cole Robinson - 8.1.0-2 - Make qemu-docs noarch diff --git a/sources b/sources index 6b76115..af888ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c +SHA512 (qemu-8.1.1.tar.xz) = 199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c From 43be60cdc42dde335f54425ca5faa8a052d4f5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 26 Sep 2023 17:46:14 +0100 Subject: [PATCH 02/21] Use correct syntax for public domain license reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 6f8807a..72578ab 100644 --- a/qemu.spec +++ b/qemu.spec @@ -344,7 +344,7 @@ Name: qemu Version: 8.1.1 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND public-domain AND CC-BY-3.0 +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 URL: http://www.qemu.org/ Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz From 9a96ecbb251e9edfe5225b28a384b385ff746793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 26 Sep 2023 17:46:36 +0100 Subject: [PATCH 03/21] Fix syntax for GCC exception reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 72578ab..ab9bf50 100644 --- a/qemu.spec +++ b/qemu.spec @@ -344,7 +344,7 @@ Name: qemu Version: 8.1.1 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 URL: http://www.qemu.org/ Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz From 5c6b4486a80263fac14f791024601522910fcc4b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 28 Sep 2023 12:38:01 -0400 Subject: [PATCH 04/21] Add rpminspect.yaml to exclude some CI false positives Signed-off-by: Cole Robinson --- rpminspect.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..fea3fc8 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,20 @@ +# complains about qemu use of: gethostbyname, inet_aton, inet_ntoa +# but warning here isn't really accomplishing anything +badfuncs: + exclude_path: .* + +# These pre-compiled files have `.symtab` +debuginfo: + ignore: + - /usr/share/qemu/palcode-clipper + - /usr/share/qemu/hppa-firmware.img + +# More pre-compiled rom warnings: +# - Program built without GNU_STACK: /usr/share/qemu/u-boot.e500 +# - Stack is still executable: /usr/share/qemu/hppa-firmware.img +elf: + exclude_path: ^/usr/share/qemu/(u-boot.e500|hppa-firmware.img)$ + +# CryptoPkg fuzz tests have invalid unicode, but I assume that's intentional +unicode: + exclude: .*edk2/CryptoPkg.* From 2f2f662015f4de56fe6d509cc13bee710177316a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 17 Oct 2023 11:31:50 -0400 Subject: [PATCH 05/21] spec: Use MTESTARGS to disable iotests, not a patch Signed-off-by: Cole Robinson --- ...tests-Disable-iotests-like-RHEL-does.patch | 58 ------------------- qemu.spec | 6 +- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 0001-tests-Disable-iotests-like-RHEL-does.patch diff --git a/0001-tests-Disable-iotests-like-RHEL-does.patch b/0001-tests-Disable-iotests-like-RHEL-does.patch deleted file mode 100644 index 09706e5..0000000 --- a/0001-tests-Disable-iotests-like-RHEL-does.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e4a112c75a02a789e7710e805f66211426087d55 Mon Sep 17 00:00:00 2001 -Message-ID: -From: Cole Robinson -Date: Sun, 20 Aug 2023 10:49:12 -0400 -Subject: [PATCH] tests: Disable iotests, like RHEL does -Content-type: text/plain - -Signed-off-by: Cole Robinson ---- - tests/qemu-iotests/meson.build | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build -index 44761e1e4d..78c5836325 100644 ---- a/tests/qemu-iotests/meson.build -+++ b/tests/qemu-iotests/meson.build -@@ -51,21 +51,21 @@ foreach format, speed: qemu_iotests_formats - check: true, - ) - -- foreach item: rc.stdout().strip().split() -- args = [qemu_iotests_check_cmd, -- '-tap', '-' + format, item, -- '--source-dir', meson.current_source_dir(), -- '--build-dir', meson.current_build_dir()] -- # Some individual tests take as long as 45 seconds -- # Bump the timeout to 3 minutes for some headroom -- # on slow machines to minimize spurious failures -- test('io-' + format + '-' + item, -- python, -- args: args, -- depends: qemu_iotests_binaries, -- env: qemu_iotests_env, -- protocol: 'tap', -- timeout: 180, -- suite: suites) -- endforeach -+# foreach item: rc.stdout().strip().split() -+# args = [qemu_iotests_check_cmd, -+# '-tap', '-' + format, item, -+# '--source-dir', meson.current_source_dir(), -+# '--build-dir', meson.current_build_dir()] -+# # Some individual tests take as long as 45 seconds -+# # Bump the timeout to 3 minutes for some headroom -+# # on slow machines to minimize spurious failures -+# test('io-' + format + '-' + item, -+# python, -+# args: args, -+# depends: qemu_iotests_binaries, -+# env: qemu_iotests_env, -+# protocol: 'tap', -+# timeout: 180, -+# suite: suites) -+# endforeach - endforeach --- -2.41.0 - diff --git a/qemu.spec b/qemu.spec index ab9bf50..6b534fd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -360,8 +360,6 @@ Source30: kvm-s390x.conf Source31: kvm-x86.conf Source36: README.tests -Patch0001: 0001-tests-Disable-iotests-like-RHEL-does.patch - BuildRequires: meson >= %{meson_version} BuildRequires: bison BuildRequires: flex @@ -2025,6 +2023,10 @@ rm -rf %{static_buildroot} %check +# Disable iotests. RHEL has done this forever, and these +# tests have been flakey in the past +export MTESTARGS="--no-suite block" + %if %{with check} %if !%{tools_only} From db8d68a5f9fdb0e5cc97407bbd0279831e0173ed Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 17 Oct 2023 12:40:40 -0400 Subject: [PATCH 06/21] spec: Update comment that ppc64 qtests are still flakey Signed-off-by: Cole Robinson --- qemu.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 6b534fd..e5eb781 100644 --- a/qemu.spec +++ b/qemu.spec @@ -2032,7 +2032,9 @@ export MTESTARGS="--no-suite block" pushd %{qemu_kvm_build} echo "Testing %{name}-build" -# 2022-06: ppc64le random qtest segfaults with no discernable pattern +# ppc64le random qtest segfaults with no discernable pattern +# Last check: 2023-10 +# Added: 2022-06 %ifnarch %{power64} %make_build check %endif From 547a9bc5bacefe034df4450fad82bba3d011ec42 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 17 Oct 2023 12:43:03 -0400 Subject: [PATCH 07/21] spec: Point `Source` to modern qemu.org site Signed-off-by: Cole Robinson --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index e5eb781..0f4fff9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -347,7 +347,7 @@ Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 URL: http://www.qemu.org/ -Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz +Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules From 595e23bfb723437f5b26729801bacd753678279a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 17 Oct 2023 12:45:25 -0400 Subject: [PATCH 08/21] qemu-8.1.2-1 Update to version 8.1.2 --- qemu.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index 0f4fff9..5fc5886 100644 --- a/qemu.spec +++ b/qemu.spec @@ -341,7 +341,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.1.1 +Version: 8.1.2 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 @@ -2811,6 +2811,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Oct 17 2023 Cole Robinson - 8.1.2-1 +- Update to version 8.1.2 + * Tue Sep 26 2023 Cole Robinson - 8.1.1-1 - Rebase to qemu 8.1.1 diff --git a/sources b/sources index af888ce..deac88f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-8.1.1.tar.xz) = 199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c +SHA512 (qemu-8.1.2.tar.xz) = d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8 From 63c8857a93bf308f61e58db490992df4245e962a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 19 Nov 2023 13:06:26 -0500 Subject: [PATCH 09/21] spec: Fix *.stp %files in -user and -user-static -static packages were missing some .stp files, and qemu-user wildcards were catching too much. Drop wildcards and explicitly specify all .stp files for all subpackages Signed-off-by: Cole Robinson --- qemu.spec | 315 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 271 insertions(+), 44 deletions(-) diff --git a/qemu.spec b/qemu.spec index 5fc5886..fe09a85 100644 --- a/qemu.spec +++ b/qemu.spec @@ -2425,26 +2425,111 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-xtensa %{_bindir}/qemu-xtensaeb -%{_datadir}/systemtap/tapset/qemu-i386*.stp -%{_datadir}/systemtap/tapset/qemu-x86_64*.stp -%{_datadir}/systemtap/tapset/qemu-aarch64*.stp -%{_datadir}/systemtap/tapset/qemu-alpha*.stp -%{_datadir}/systemtap/tapset/qemu-arm*.stp -%{_datadir}/systemtap/tapset/qemu-cris*.stp -%{_datadir}/systemtap/tapset/qemu-hppa*.stp -%{_datadir}/systemtap/tapset/qemu-hexagon*.stp -%{_datadir}/systemtap/tapset/qemu-loongarch64*.stp -%{_datadir}/systemtap/tapset/qemu-m68k*.stp -%{_datadir}/systemtap/tapset/qemu-microblaze*.stp -%{_datadir}/systemtap/tapset/qemu-mips*.stp -%{_datadir}/systemtap/tapset/qemu-nios2*.stp -%{_datadir}/systemtap/tapset/qemu-or1k*.stp -%{_datadir}/systemtap/tapset/qemu-ppc*.stp -%{_datadir}/systemtap/tapset/qemu-riscv*.stp -%{_datadir}/systemtap/tapset/qemu-s390x*.stp -%{_datadir}/systemtap/tapset/qemu-sh4*.stp -%{_datadir}/systemtap/tapset/qemu-sparc*.stp -%{_datadir}/systemtap/tapset/qemu-xtensa*.stp +%{_datadir}/systemtap/tapset/qemu-aarch64.stp +%{_datadir}/systemtap/tapset/qemu-aarch64-log.stp +%{_datadir}/systemtap/tapset/qemu-aarch64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-log.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-alpha.stp +%{_datadir}/systemtap/tapset/qemu-alpha-log.stp +%{_datadir}/systemtap/tapset/qemu-alpha-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-armeb.stp +%{_datadir}/systemtap/tapset/qemu-armeb-log.stp +%{_datadir}/systemtap/tapset/qemu-armeb-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-arm.stp +%{_datadir}/systemtap/tapset/qemu-arm-log.stp +%{_datadir}/systemtap/tapset/qemu-arm-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-cris.stp +%{_datadir}/systemtap/tapset/qemu-cris-log.stp +%{_datadir}/systemtap/tapset/qemu-cris-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-hexagon.stp +%{_datadir}/systemtap/tapset/qemu-hexagon-log.stp +%{_datadir}/systemtap/tapset/qemu-hexagon-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-hppa.stp +%{_datadir}/systemtap/tapset/qemu-hppa-log.stp +%{_datadir}/systemtap/tapset/qemu-hppa-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-i386.stp +%{_datadir}/systemtap/tapset/qemu-i386-log.stp +%{_datadir}/systemtap/tapset/qemu-i386-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-loongarch64.stp +%{_datadir}/systemtap/tapset/qemu-loongarch64-log.stp +%{_datadir}/systemtap/tapset/qemu-loongarch64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-m68k.stp +%{_datadir}/systemtap/tapset/qemu-m68k-log.stp +%{_datadir}/systemtap/tapset/qemu-m68k-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-microblaze.stp +%{_datadir}/systemtap/tapset/qemu-microblaze-log.stp +%{_datadir}/systemtap/tapset/qemu-microblaze-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-microblazeel.stp +%{_datadir}/systemtap/tapset/qemu-microblazeel-log.stp +%{_datadir}/systemtap/tapset/qemu-microblazeel-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mips.stp +%{_datadir}/systemtap/tapset/qemu-mips-log.stp +%{_datadir}/systemtap/tapset/qemu-mips-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mips64el.stp +%{_datadir}/systemtap/tapset/qemu-mips64el-log.stp +%{_datadir}/systemtap/tapset/qemu-mips64el-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mips64.stp +%{_datadir}/systemtap/tapset/qemu-mips64-log.stp +%{_datadir}/systemtap/tapset/qemu-mips64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mipsel.stp +%{_datadir}/systemtap/tapset/qemu-mipsel-log.stp +%{_datadir}/systemtap/tapset/qemu-mipsel-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32-log.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32el.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32el-log.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32el-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-nios2.stp +%{_datadir}/systemtap/tapset/qemu-nios2-log.stp +%{_datadir}/systemtap/tapset/qemu-nios2-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-or1k.stp +%{_datadir}/systemtap/tapset/qemu-or1k-log.stp +%{_datadir}/systemtap/tapset/qemu-or1k-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-ppc.stp +%{_datadir}/systemtap/tapset/qemu-ppc-log.stp +%{_datadir}/systemtap/tapset/qemu-ppc-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-ppc64.stp +%{_datadir}/systemtap/tapset/qemu-ppc64-log.stp +%{_datadir}/systemtap/tapset/qemu-ppc64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-ppc64le.stp +%{_datadir}/systemtap/tapset/qemu-ppc64le-log.stp +%{_datadir}/systemtap/tapset/qemu-ppc64le-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-riscv32.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-log.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-riscv64.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-log.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-s390x.stp +%{_datadir}/systemtap/tapset/qemu-s390x-log.stp +%{_datadir}/systemtap/tapset/qemu-s390x-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-sh4.stp +%{_datadir}/systemtap/tapset/qemu-sh4-log.stp +%{_datadir}/systemtap/tapset/qemu-sh4-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-sh4eb.stp +%{_datadir}/systemtap/tapset/qemu-sh4eb-log.stp +%{_datadir}/systemtap/tapset/qemu-sh4eb-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-sparc.stp +%{_datadir}/systemtap/tapset/qemu-sparc-log.stp +%{_datadir}/systemtap/tapset/qemu-sparc-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus-log.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-sparc64.stp +%{_datadir}/systemtap/tapset/qemu-sparc64-log.stp +%{_datadir}/systemtap/tapset/qemu-sparc64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-x86_64.stp +%{_datadir}/systemtap/tapset/qemu-x86_64-log.stp +%{_datadir}/systemtap/tapset/qemu-x86_64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-xtensa.stp +%{_datadir}/systemtap/tapset/qemu-xtensa-log.stp +%{_datadir}/systemtap/tapset/qemu-xtensa-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-xtensaeb.stp +%{_datadir}/systemtap/tapset/qemu-xtensaeb-log.stp +%{_datadir}/systemtap/tapset/qemu-xtensaeb-simpletrace.stp %files user-binfmt @@ -2457,7 +2542,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-aarch64 %{_bindir}/qemu-aarch64-static %{_bindir}/qemu-aarch64_be-static -%{_datadir}/systemtap/tapset/qemu-aarch64.stp +%{_datadir}/systemtap/tapset/qemu-aarch64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-log-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-aarch64_be-static.stp %ifnarch aarch64 %{_exec_prefix}/lib/binfmt.d/qemu-aarch64-static.conf @@ -2466,12 +2555,19 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-alpha %{_bindir}/qemu-alpha-static +%{_datadir}/systemtap/tapset/qemu-alpha-log-static.stp +%{_datadir}/systemtap/tapset/qemu-alpha-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-alpha-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-alpha-static.conf %files user-static-arm %{_bindir}/qemu-arm-static %{_bindir}/qemu-armeb-static +%{_datadir}/systemtap/tapset/qemu-arm-log-static.stp +%{_datadir}/systemtap/tapset/qemu-arm-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-arm-static.stp +%{_datadir}/systemtap/tapset/qemu-armeb-log-static.stp +%{_datadir}/systemtap/tapset/qemu-armeb-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-armeb-static.stp %ifnarch aarch64 %{_exec_prefix}/lib/binfmt.d/qemu-arm-static.conf @@ -2480,32 +2576,46 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-cris %{_bindir}/qemu-cris-static +%{_datadir}/systemtap/tapset/qemu-cris-log-static.stp +%{_datadir}/systemtap/tapset/qemu-cris-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-cris-static.stp %files user-static-hexagon %{_bindir}/qemu-hexagon-static +%{_datadir}/systemtap/tapset/qemu-hexagon-log-static.stp +%{_datadir}/systemtap/tapset/qemu-hexagon-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-hexagon-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-hexagon-static.conf %files user-static-hppa %{_bindir}/qemu-hppa-static +%{_datadir}/systemtap/tapset/qemu-hppa-log-static.stp +%{_datadir}/systemtap/tapset/qemu-hppa-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-hppa-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-hppa-static.conf %files user-static-loongarch64 %{_bindir}/qemu-loongarch64-static +%{_datadir}/systemtap/tapset/qemu-loongarch64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-loongarch64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-loongarch64-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-loongarch64-static.conf %files user-static-m68k %{_bindir}/qemu-m68k-static +%{_datadir}/systemtap/tapset/qemu-m68k-log-static.stp +%{_datadir}/systemtap/tapset/qemu-m68k-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-m68k-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-m68k-static.conf %files user-static-microblaze %{_bindir}/qemu-microblaze-static %{_bindir}/qemu-microblazeel-static +%{_datadir}/systemtap/tapset/qemu-microblaze-log-static.stp +%{_datadir}/systemtap/tapset/qemu-microblaze-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-microblaze-static.stp +%{_datadir}/systemtap/tapset/qemu-microblazeel-log-static.stp +%{_datadir}/systemtap/tapset/qemu-microblazeel-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-microblazeel-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-microblaze-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-microblazeel-static.conf @@ -2517,11 +2627,23 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-mipsel-static %{_bindir}/qemu-mipsn32-static %{_bindir}/qemu-mipsn32el-static +%{_datadir}/systemtap/tapset/qemu-mips-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mips-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mips-static.stp +%{_datadir}/systemtap/tapset/qemu-mips64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mips64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mips64-static.stp +%{_datadir}/systemtap/tapset/qemu-mips64el-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mips64el-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mips64el-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsel-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsel-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mipsel-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mipsn32-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32el-log-static.stp +%{_datadir}/systemtap/tapset/qemu-mipsn32el-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-mipsn32el-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-mips-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-mips64-static.conf @@ -2532,10 +2654,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-nios2 %{_bindir}/qemu-nios2-static +%{_datadir}/systemtap/tapset/qemu-nios2-log-static.stp +%{_datadir}/systemtap/tapset/qemu-nios2-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-nios2-static.stp %files user-static-or1k %{_bindir}/qemu-or1k-static +%{_datadir}/systemtap/tapset/qemu-or1k-log-static.stp +%{_datadir}/systemtap/tapset/qemu-or1k-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-or1k-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-or1k-static.conf @@ -2543,8 +2669,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-ppc-static %{_bindir}/qemu-ppc64-static %{_bindir}/qemu-ppc64le-static +%{_datadir}/systemtap/tapset/qemu-ppc-log-static.stp +%{_datadir}/systemtap/tapset/qemu-ppc-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-ppc-static.stp +%{_datadir}/systemtap/tapset/qemu-ppc64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-ppc64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-ppc64-static.stp +%{_datadir}/systemtap/tapset/qemu-ppc64le-log-static.stp +%{_datadir}/systemtap/tapset/qemu-ppc64le-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-ppc64le-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-ppc-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-ppc64-static.conf @@ -2555,7 +2687,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-riscv %{_bindir}/qemu-riscv32-static %{_bindir}/qemu-riscv64-static +%{_datadir}/systemtap/tapset/qemu-riscv32-log-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-riscv32-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-riscv64-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf %ifnarch riscv64 @@ -2564,6 +2700,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-s390x %{_bindir}/qemu-s390x-static +%{_datadir}/systemtap/tapset/qemu-s390x-log-static.stp +%{_datadir}/systemtap/tapset/qemu-s390x-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-s390x-static.stp %ifnarch s390x %{_exec_prefix}/lib/binfmt.d/qemu-s390x-static.conf @@ -2572,7 +2710,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-sh4 %{_bindir}/qemu-sh4-static %{_bindir}/qemu-sh4eb-static +%{_datadir}/systemtap/tapset/qemu-sh4-log-static.stp +%{_datadir}/systemtap/tapset/qemu-sh4-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-sh4-static.stp +%{_datadir}/systemtap/tapset/qemu-sh4eb-log-static.stp +%{_datadir}/systemtap/tapset/qemu-sh4eb-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-sh4eb-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-sh4-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-sh4eb-static.conf @@ -2581,9 +2723,15 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-sparc-static %{_bindir}/qemu-sparc32plus-static %{_bindir}/qemu-sparc64-static +%{_datadir}/systemtap/tapset/qemu-sparc-log-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-sparc-static.stp -%{_datadir}/systemtap/tapset/qemu-sparc32plus-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-sparc64-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus-log-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-sparc32plus-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-sparc-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-sparc32plus-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-sparc64-static.conf @@ -2591,7 +2739,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-x86 %{_bindir}/qemu-i386-static %{_bindir}/qemu-x86_64-static +%{_datadir}/systemtap/tapset/qemu-i386-log-static.stp +%{_datadir}/systemtap/tapset/qemu-i386-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-i386-static.stp +%{_datadir}/systemtap/tapset/qemu-x86_64-log-static.stp +%{_datadir}/systemtap/tapset/qemu-x86_64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-x86_64-static.stp %ifnarch %{ix86} x86_64 %{_exec_prefix}/lib/binfmt.d/qemu-i386-static.conf @@ -2602,7 +2754,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files user-static-xtensa %{_bindir}/qemu-xtensa-static %{_bindir}/qemu-xtensaeb-static +%{_datadir}/systemtap/tapset/qemu-xtensa-log-static.stp +%{_datadir}/systemtap/tapset/qemu-xtensa-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-xtensa-static.stp +%{_datadir}/systemtap/tapset/qemu-xtensaeb-log-static.stp +%{_datadir}/systemtap/tapset/qemu-xtensaeb-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-xtensaeb-static.stp %{_exec_prefix}/lib/binfmt.d/qemu-xtensa-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-xtensaeb-static.conf @@ -2613,14 +2769,18 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-aarch64 %files system-aarch64-core %{_bindir}/qemu-system-aarch64 -%{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp +%{_datadir}/systemtap/tapset/qemu-system-aarch64.stp +%{_datadir}/systemtap/tapset/qemu-system-aarch64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-aarch64-simpletrace.stp %{_mandir}/man1/qemu-system-aarch64.1* %files system-alpha %files system-alpha-core %{_bindir}/qemu-system-alpha -%{_datadir}/systemtap/tapset/qemu-system-alpha*.stp +%{_datadir}/systemtap/tapset/qemu-system-alpha.stp +%{_datadir}/systemtap/tapset/qemu-system-alpha-log.stp +%{_datadir}/systemtap/tapset/qemu-system-alpha-simpletrace.stp %{_mandir}/man1/qemu-system-alpha.1* %{_datadir}/%{name}/palcode-clipper @@ -2629,28 +2789,36 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-arm-core %{_bindir}/qemu-system-arm %{_datadir}/%{name}/npcm7xx_bootrom.bin -%{_datadir}/systemtap/tapset/qemu-system-arm*.stp +%{_datadir}/systemtap/tapset/qemu-system-arm.stp +%{_datadir}/systemtap/tapset/qemu-system-arm-log.stp +%{_datadir}/systemtap/tapset/qemu-system-arm-simpletrace.stp %{_mandir}/man1/qemu-system-arm.1* %files system-avr %files system-avr-core %{_bindir}/qemu-system-avr -%{_datadir}/systemtap/tapset/qemu-system-avr*.stp +%{_datadir}/systemtap/tapset/qemu-system-avr.stp +%{_datadir}/systemtap/tapset/qemu-system-avr-log.stp +%{_datadir}/systemtap/tapset/qemu-system-avr-simpletrace.stp %{_mandir}/man1/qemu-system-avr.1* %files system-cris %files system-cris-core %{_bindir}/qemu-system-cris -%{_datadir}/systemtap/tapset/qemu-system-cris*.stp +%{_datadir}/systemtap/tapset/qemu-system-cris.stp +%{_datadir}/systemtap/tapset/qemu-system-cris-log.stp +%{_datadir}/systemtap/tapset/qemu-system-cris-simpletrace.stp %{_mandir}/man1/qemu-system-cris.1* %files system-hppa %files system-hppa-core %{_bindir}/qemu-system-hppa -%{_datadir}/systemtap/tapset/qemu-system-hppa*.stp +%{_datadir}/systemtap/tapset/qemu-system-hppa.stp +%{_datadir}/systemtap/tapset/qemu-system-hppa-log.stp +%{_datadir}/systemtap/tapset/qemu-system-hppa-simpletrace.stp %{_mandir}/man1/qemu-system-hppa.1* %{_datadir}/%{name}/hppa-firmware.img @@ -2658,14 +2826,18 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-loongarch64 %files system-loongarch64-core %{_bindir}/qemu-system-loongarch64 -%{_datadir}/systemtap/tapset/qemu-system-loongarch64*.stp +%{_datadir}/systemtap/tapset/qemu-system-loongarch64.stp +%{_datadir}/systemtap/tapset/qemu-system-loongarch64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-loongarch64-simpletrace.stp %{_mandir}/man1/qemu-system-loongarch64.1* %files system-m68k %files system-m68k-core %{_bindir}/qemu-system-m68k -%{_datadir}/systemtap/tapset/qemu-system-m68k*.stp +%{_datadir}/systemtap/tapset/qemu-system-m68k.stp +%{_datadir}/systemtap/tapset/qemu-system-m68k-log.stp +%{_datadir}/systemtap/tapset/qemu-system-m68k-simpletrace.stp %{_mandir}/man1/qemu-system-m68k.1* @@ -2673,7 +2845,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-microblaze-core %{_bindir}/qemu-system-microblaze %{_bindir}/qemu-system-microblazeel -%{_datadir}/systemtap/tapset/qemu-system-microblaze*.stp +%{_datadir}/systemtap/tapset/qemu-system-microblaze.stp +%{_datadir}/systemtap/tapset/qemu-system-microblaze-log.stp +%{_datadir}/systemtap/tapset/qemu-system-microblaze-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-microblazeel.stp +%{_datadir}/systemtap/tapset/qemu-system-microblazeel-log.stp +%{_datadir}/systemtap/tapset/qemu-system-microblazeel-simpletrace.stp %{_mandir}/man1/qemu-system-microblaze.1* %{_mandir}/man1/qemu-system-microblazeel.1* %{_datadir}/%{name}/petalogix*.dtb @@ -2685,7 +2862,18 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-system-mipsel %{_bindir}/qemu-system-mips64 %{_bindir}/qemu-system-mips64el -%{_datadir}/systemtap/tapset/qemu-system-mips*.stp +%{_datadir}/systemtap/tapset/qemu-system-mips.stp +%{_datadir}/systemtap/tapset/qemu-system-mips-log.stp +%{_datadir}/systemtap/tapset/qemu-system-mips-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-mipsel.stp +%{_datadir}/systemtap/tapset/qemu-system-mipsel-log.stp +%{_datadir}/systemtap/tapset/qemu-system-mipsel-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64el.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64el-log.stp +%{_datadir}/systemtap/tapset/qemu-system-mips64el-simpletrace.stp %{_mandir}/man1/qemu-system-mips.1* %{_mandir}/man1/qemu-system-mipsel.1* %{_mandir}/man1/qemu-system-mips64el.1* @@ -2695,14 +2883,18 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-nios2 %files system-nios2-core %{_bindir}/qemu-system-nios2 -%{_datadir}/systemtap/tapset/qemu-system-nios2*.stp +%{_datadir}/systemtap/tapset/qemu-system-nios2.stp +%{_datadir}/systemtap/tapset/qemu-system-nios2-log.stp +%{_datadir}/systemtap/tapset/qemu-system-nios2-simpletrace.stp %{_mandir}/man1/qemu-system-nios2.1* %files system-or1k %files system-or1k-core %{_bindir}/qemu-system-or1k -%{_datadir}/systemtap/tapset/qemu-system-or1k*.stp +%{_datadir}/systemtap/tapset/qemu-system-or1k.stp +%{_datadir}/systemtap/tapset/qemu-system-or1k-log.stp +%{_datadir}/systemtap/tapset/qemu-system-or1k-simpletrace.stp %{_mandir}/man1/qemu-system-or1k.1* @@ -2710,7 +2902,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-ppc-core %{_bindir}/qemu-system-ppc %{_bindir}/qemu-system-ppc64 -%{_datadir}/systemtap/tapset/qemu-system-ppc*.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc-log.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc64.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-ppc64-simpletrace.stp %{_mandir}/man1/qemu-system-ppc.1* %{_mandir}/man1/qemu-system-ppc64.1* %{_datadir}/%{name}/bamboo.dtb @@ -2730,21 +2927,30 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-system-riscv32 %{_bindir}/qemu-system-riscv64 %{_datadir}/%{name}/opensbi-riscv*.bin -%{_datadir}/systemtap/tapset/qemu-system-riscv*.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv32.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv32-log.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv32-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv64.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-riscv64-simpletrace.stp %{_mandir}/man1/qemu-system-riscv*.1* %files system-rx %files system-rx-core %{_bindir}/qemu-system-rx -%{_datadir}/systemtap/tapset/qemu-system-rx*.stp +%{_datadir}/systemtap/tapset/qemu-system-rx.stp +%{_datadir}/systemtap/tapset/qemu-system-rx-log.stp +%{_datadir}/systemtap/tapset/qemu-system-rx-simpletrace.stp %{_mandir}/man1/qemu-system-rx.1* %files system-s390x %files system-s390x-core %{_bindir}/qemu-system-s390x -%{_datadir}/systemtap/tapset/qemu-system-s390x*.stp +%{_datadir}/systemtap/tapset/qemu-system-s390x.stp +%{_datadir}/systemtap/tapset/qemu-system-s390x-log.stp +%{_datadir}/systemtap/tapset/qemu-system-s390x-simpletrace.stp %{_mandir}/man1/qemu-system-s390x.1* %{_datadir}/%{name}/s390-ccw.img %{_datadir}/%{name}/s390-netboot.img @@ -2754,7 +2960,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-sh4-core %{_bindir}/qemu-system-sh4 %{_bindir}/qemu-system-sh4eb -%{_datadir}/systemtap/tapset/qemu-system-sh4*.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4-log.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4eb.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4eb-log.stp +%{_datadir}/systemtap/tapset/qemu-system-sh4eb-simpletrace.stp %{_mandir}/man1/qemu-system-sh4.1* %{_mandir}/man1/qemu-system-sh4eb.1* @@ -2763,7 +2974,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-sparc-core %{_bindir}/qemu-system-sparc %{_bindir}/qemu-system-sparc64 -%{_datadir}/systemtap/tapset/qemu-system-sparc*.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc-log.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc64.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-sparc64-simpletrace.stp %{_mandir}/man1/qemu-system-sparc.1* %{_mandir}/man1/qemu-system-sparc64.1* %{_datadir}/%{name}/QEMU,tcx.bin @@ -2773,7 +2989,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-tricore %files system-tricore-core %{_bindir}/qemu-system-tricore -%{_datadir}/systemtap/tapset/qemu-system-tricore*.stp +%{_datadir}/systemtap/tapset/qemu-system-tricore.stp +%{_datadir}/systemtap/tapset/qemu-system-tricore-log.stp +%{_datadir}/systemtap/tapset/qemu-system-tricore-simpletrace.stp %{_mandir}/man1/qemu-system-tricore.1* @@ -2783,8 +3001,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-system-x86_64 %{_libdir}/%{name}/accel-tcg-i386.so %{_libdir}/%{name}/accel-tcg-x86_64.so -%{_datadir}/systemtap/tapset/qemu-system-i386*.stp -%{_datadir}/systemtap/tapset/qemu-system-x86_64*.stp +%{_datadir}/systemtap/tapset/qemu-system-i386.stp +%{_datadir}/systemtap/tapset/qemu-system-i386-log.stp +%{_datadir}/systemtap/tapset/qemu-system-i386-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-x86_64.stp +%{_datadir}/systemtap/tapset/qemu-system-x86_64-log.stp +%{_datadir}/systemtap/tapset/qemu-system-x86_64-simpletrace.stp %{_mandir}/man1/qemu-system-i386.1* %{_mandir}/man1/qemu-system-x86_64.1* %{_datadir}/%{name}/kvmvapic.bin @@ -2803,7 +3025,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files system-xtensa-core %{_bindir}/qemu-system-xtensa %{_bindir}/qemu-system-xtensaeb -%{_datadir}/systemtap/tapset/qemu-system-xtensa*.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensa.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensa-log.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensa-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensaeb.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensaeb-log.stp +%{_datadir}/systemtap/tapset/qemu-system-xtensaeb-simpletrace.stp %{_mandir}/man1/qemu-system-xtensa.1* %{_mandir}/man1/qemu-system-xtensaeb.1* # endif !tools_only From 9e1191cbbc762751e25fc6f17ccd9be8212b4803 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Nov 2023 13:55:19 +0000 Subject: [PATCH 10/21] Bump and rebuild for capstone 5.0.1 --- qemu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index fe09a85..700375e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -337,7 +337,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 1 +%global baserelease 2 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3038,6 +3038,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Nov 28 2023 Richard W.M. Jones - 2:8.1.2-2 +- Bump and rebuild for capstone 5.0.1 + * Tue Oct 17 2023 Cole Robinson - 8.1.2-1 - Update to version 8.1.2 From e5cb9532c0bd90554081b3ccad5b9cc26592112c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 28 Nov 2023 17:28:52 -0800 Subject: [PATCH 11/21] Backport patch from crobinso to fix build on Rawhide --- ...m-Fix-pvh.img-ld-build-failure-on-fe.patch | 37 +++++++++++++++++++ qemu.spec | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch diff --git a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch new file mode 100644 index 0000000..1cb8691 --- /dev/null +++ b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch @@ -0,0 +1,37 @@ +From 9a9ff4c9129de5d65a0e7cbba45a8ad89ddc51cd Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 28 Nov 2023 09:36:47 -0500 +Subject: [PATCH] pc-bios/optionrom: Fix pvh.img ld build failure on fedora + rawhide + +binutils 2.39 shows some warnings when building pvh.img + +/usr/bin/ld: warning: pvh.o: missing .note.GNU-stack section implies executable stack +/usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +/usr/bin/ld: warning: pvh.img has a LOAD segment with RWX permissions + +The latter of which is fatal on Fedora rawhide for some reason. + +Add linker options to suppress the errors + +Signed-off-by: Cole Robinson +--- + pc-bios/optionrom/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 30d07026c7..f54ed39b54 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -36,7 +36,7 @@ config-cc.mak: Makefile + $(call cc-option,-Wno-array-bounds)) 3> config-cc.mak + -include config-cc.mak + +-override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds ++override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds -Wl,--no-warn-rwx-segments -Wl,--no-warn-execstack + + pvh.img: pvh.o pvh_main.o + +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index 700375e..849a049 100644 --- a/qemu.spec +++ b/qemu.spec @@ -349,6 +349,10 @@ URL: http://www.qemu.org/ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz +# https://patchwork.kernel.org/project/qemu-devel/patch/20231128143647.847668-1-crobinso@redhat.com/ +# Fix pvh.img ld build failure on fedora rawhide +Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch + Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules Source12: bridge.conf @@ -3040,6 +3044,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog * Tue Nov 28 2023 Richard W.M. Jones - 2:8.1.2-2 - Bump and rebuild for capstone 5.0.1 +- Backport patch from crobinso to fix build on Rawhide * Tue Oct 17 2023 Cole Robinson - 8.1.2-1 - Update to version 8.1.2 From 2818b991c345595878afa7a61d7d18ea1a5122f5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 Nov 2023 20:10:47 +0000 Subject: [PATCH 12/21] Bump and rebuild for xen 4.18.0 --- qemu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 849a049..b728aa2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -337,7 +337,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 2 +%global baserelease 3 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3042,6 +3042,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Nov 29 2023 Richard W.M. Jones - 2:8.1.2-3 +- Bump and rebuild for xen 4.18.0 + * Tue Nov 28 2023 Richard W.M. Jones - 2:8.1.2-2 - Bump and rebuild for capstone 5.0.1 - Backport patch from crobinso to fix build on Rawhide From deeb9357cb751df21c566fd8408936cfb034d43b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 21 Nov 2023 12:04:23 -0500 Subject: [PATCH 13/21] Rebase to qemu-8.2.0-rc2 + Add device-display-virtio-gpu-pci-rutabaga subpackage + Add BuildRequires: libxdp-devel + Add BuildRequires: keytuils-libs-devel Signed-off-by: Cole Robinson --- ...m-Fix-pvh.img-ld-build-failure-on-fe.patch | 8 +- qemu.spec | 91 ++++++++++++++++++- sources | 2 +- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch index 1cb8691..87d8a11 100644 --- a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch +++ b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch @@ -1,8 +1,9 @@ -From 9a9ff4c9129de5d65a0e7cbba45a8ad89ddc51cd Mon Sep 17 00:00:00 2001 +From 98287d67f3ea6c49795838beda4b020cf236fc20 Mon Sep 17 00:00:00 2001 From: Cole Robinson -Date: Tue, 28 Nov 2023 09:36:47 -0500 +Date: Mon, 27 Nov 2023 12:51:25 -0500 Subject: [PATCH] pc-bios/optionrom: Fix pvh.img ld build failure on fedora rawhide +Content-type: text/plain binutils 2.39 shows some warnings when building pvh.img @@ -32,6 +33,3 @@ index 30d07026c7..f54ed39b54 100644 pvh.img: pvh.o pvh_main.o --- -2.43.0 - diff --git a/qemu.spec b/qemu.spec index b728aa2..4f4ca48 100644 --- a/qemu.spec +++ b/qemu.spec @@ -160,6 +160,13 @@ %define have_libcacard 0 %endif +%define have_rutabaga_gfx 0 +%if 0%{?fedora} >= 40 +%ifarch x86_64 aarch64 +%define have_rutabaga_gfx 1 +%endif +%endif + # LTO still has issues with qemu on armv7hl and aarch64 # https://bugzilla.redhat.com/show_bug.cgi?id=1952483 %global _lto_cflags %{nil} @@ -240,6 +247,16 @@ %define requires_device_display_virtio_gpu_pci_gl %{nil} %endif +%if %{have_rutabaga_gfx} +%define requires_device_display_virtio_gpu_rutabaga Requires: %{name}-device-display-virtio-gpu-rutabaga = %{evr} +%define requires_device_display_virtio_gpu_pci_rutabaga Requires: %{name}-device-display-virtio-gpu-pci-rutabaga = %{evr} +%define requires_device_display_virtio_vga_rutabaga Requires: %{name}-device-display-virtio-vga-rutabaga = %{evr} +%else +%define requires_device_display_virtio_gpu_rutabaga %{nil} +%define requires_device_display_virtio_gpu_pci_rutabaga %{nil} +%define requires_device_display_virtio_vga_rutabaga %{nil} +%endif + %if %{have_jack} %define jack_drv jack, %define requires_audio_jack Requires: %{name}-audio-jack = %{evr} @@ -306,10 +323,13 @@ %{requires_device_display_virtio_gpu} \ %{requires_device_display_virtio_gpu_ccw} \ %{requires_device_display_virtio_gpu_gl} \ +%{requires_device_display_virtio_gpu_rutabaga} \ %{requires_device_display_virtio_gpu_pci} \ %{requires_device_display_virtio_gpu_pci_gl} \ +%{requires_device_display_virtio_gpu_pci_rutabaga} \ %{requires_device_display_virtio_vga} \ %{requires_device_display_virtio_vga_gl} \ +%{requires_device_display_virtio_vga_rutabaga} \ %{requires_device_usb_host} \ %{requires_device_usb_redirect} \ %{requires_device_usb_smartcard} \ @@ -330,18 +350,18 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -# global rcver rc4 +%global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 3 +%global baserelease 0.1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.1.2 +Version: 8.2.0 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 @@ -517,7 +537,16 @@ BuildRequires: SDL2_image-devel # Used by vnc-display-test BuildRequires: pkgconfig(gvnc-1.0) %endif +# Used by pipewire audio backend BuildRequires: pipewire-devel +# Used by cryptodev-backend-lkcf +BuildRequires: keyutils-libs-devel +# Used by net AF_XDP +BuildRequires: libxdp-devel +# used by virtio-gpu-rutabaga +%if %{have_rutabaga_gfx} +BuildRequires: rutabaga-gfx-ffi-devel +%endif %if %{user_static} BuildRequires: glibc-static glib2-static zlib-static @@ -835,6 +864,14 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} This package provides the virtio-gpu-gl display device for QEMU. %endif +%if %{have_rutabaga_gfx} +%package device-display-virtio-gpu-rutabaga +Summary: QEMU virtio-gpu-rutabaga display device +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description device-display-virtio-gpu-rutabaga +This package provides the virtio-gpu-rutabaga display device for QEMU. +%endif + %package device-display-virtio-gpu-pci Summary: QEMU virtio-gpu-pci display device Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -849,6 +886,14 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} This package provides the virtio-gpu-pci-gl display device for QEMU. %endif +%if %{have_rutabaga_gfx} +%package device-display-virtio-gpu-pci-rutabaga +Summary: QEMU virtio-gpu-pci-rutabaga display device +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description device-display-virtio-gpu-pci-rutabaga +This package provides the virtio-gpu-pci-rutabaga display device for QEMU. +%endif + %package device-display-virtio-gpu-ccw Summary: QEMU virtio-gpu-ccw display device Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -867,6 +912,15 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} %description device-display-virtio-vga-gl This package provides the virtio-vga-gl display device for QEMU. +%if %{have_rutabaga_gfx} +%package device-display-virtio-vga-rutabaga +Summary: QEMU virtio-vga-rutabaga display device +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description device-display-virtio-vga-rutabaga +This package provides the virtio-vga-rutabaga display device for QEMU. +%endif + + %package device-usb-host Summary: QEMU usb host device Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -1451,6 +1505,7 @@ mkdir -p %{static_builddir} %build %define disable_everything \\\ --audio-drv-list= \\\ + --disable-af-xdp \\\ --disable-alsa \\\ --disable-attr \\\ --disable-auth-pam \\\ @@ -1497,7 +1552,7 @@ mkdir -p %{static_builddir} --disable-gtk-clipboard \\\ --disable-guest-agent \\\ --disable-guest-agent-msi \\\ - --disable-hax \\\ + --disable-hv-balloon \\\ --disable-hvf \\\ --disable-iconv \\\ --disable-jack \\\ @@ -1505,6 +1560,7 @@ mkdir -p %{static_builddir} --disable-l2tpv3 \\\ --disable-libdaxctl \\\ --disable-libdw \\\ + --disable-libkeyutils \\\ --disable-libiscsi \\\ --disable-libnfs \\\ --disable-libpmem \\\ @@ -1534,13 +1590,17 @@ mkdir -p %{static_builddir} --disable-parallels \\\ --disable-pie \\\ --disable-pipewire \\\ + --disable-pixman \\\ + --disable-plugins \\\ --disable-pvrdma \\\ --disable-qcow1 \\\ --disable-qed \\\ --disable-qom-cast-debug \\\ --disable-rbd \\\ --disable-rdma \\\ + --disable-relocatable \\\ --disable-replication \\\ + --disable-rutabaga-gfx \\\ --disable-rng-none \\\ --disable-safe-stack \\\ --disable-sanitizers \\\ @@ -1639,6 +1699,7 @@ run_configure \ %if %{defined block_drivers_ro_list} --block-drv-ro-whitelist=%{block_drivers_ro_list} \ %endif + --enable-af-xdp \ --enable-alsa \ --enable-attr \ %ifarch %{ix86} x86_64 @@ -1696,9 +1757,11 @@ run_configure \ --enable-pa \ --enable-pie \ --enable-pipewire \ + --enable-pixman \ %if %{have_block_rbd} --enable-rbd \ %endif + --enable-relocatable \ %if %{have_librdma} --enable-rdma \ %endif @@ -1744,8 +1807,10 @@ run_configure \ --enable-glusterfs \ %endif --enable-gtk \ + --enable-hv-balloon \ --enable-libdaxctl \ --enable-libdw \ + --enable-libkeyutils \ %if %{have_block_nfs} --enable-libnfs \ %endif @@ -1763,6 +1828,9 @@ run_configure \ --enable-qed \ --enable-qom-cast-debug \ --enable-replication \ +%if %{have_rutabaga_gfx} + --enable-rutabaga-gfx \ +%endif --enable-sdl \ %if %{have_sdl_image} --enable-sdl-image \ @@ -2341,18 +2409,30 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files device-display-virtio-gpu-gl %{_libdir}/%{name}/hw-display-virtio-gpu-gl.so %endif +%if %{have_rutabaga_gfx} +%files device-display-virtio-gpu-rutabaga +%{_libdir}/%{name}/hw-display-virtio-gpu-rutabaga.so +%endif %files device-display-virtio-gpu-pci %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so %if %{have_virgl} %files device-display-virtio-gpu-pci-gl %{_libdir}/%{name}/hw-display-virtio-gpu-pci-gl.so %endif +%if %{have_rutabaga_gfx} +%files device-display-virtio-gpu-pci-rutabaga +%{_libdir}/%{name}/hw-display-virtio-gpu-pci-rutabaga.so +%endif %files device-display-virtio-gpu-ccw %{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so %files device-display-virtio-vga %{_libdir}/%{name}/hw-display-virtio-vga.so %files device-display-virtio-vga-gl %{_libdir}/%{name}/hw-display-virtio-vga-gl.so +%if %{have_rutabaga_gfx} +%files device-display-virtio-vga-rutabaga +%{_libdir}/%{name}/hw-display-virtio-vga-rutabaga.so +%endif %files device-usb-host %{_libdir}/%{name}/hw-usb-host.so %files device-usb-redirect @@ -3042,6 +3122,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Sat Dec 02 2023 Cole Robinson - 8.2.0-0.1-rc2 +- Rebase to qemu 8.2.0-rc2 + * Wed Nov 29 2023 Richard W.M. Jones - 2:8.1.2-3 - Bump and rebuild for xen 4.18.0 diff --git a/sources b/sources index deac88f..5f93671 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-8.1.2.tar.xz) = d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8 +SHA512 (qemu-8.2.0-rc2.tar.xz) = d9385840599c66e9ab0e36509a1242dcf9db33f8a4d1971e078bcc645b75c792cdfd3470d98ccafc2f52da5b048eff4dc97c6092df5d359569cdabb1e2878bbf From a93659c0413b70100cbe68a300fece17f959ecbd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Dec 2023 12:26:13 +0000 Subject: [PATCH 14/21] Bump and rebuild for xen 4.18.0 --- qemu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 4f4ca48..b14785b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -357,7 +357,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.1 +%global baserelease 0.2 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3122,6 +3122,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Dec 05 2023 Richard W.M. Jones - 2:8.2.0-0.2.rc2 +- Bump and rebuild for xen 4.18.0 + * Sat Dec 02 2023 Cole Robinson - 8.2.0-0.1-rc2 - Rebase to qemu 8.2.0-rc2 From d047f9926546e177c41a78e299cbe9339fca335f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 8 Dec 2023 09:09:11 +0000 Subject: [PATCH 15/21] Add patch to fix Xen build See: https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01035.html --- 0001-fix-qemu-build-with-xen-4.18.0.patch | 26 +++++++++++++++++++++++ qemu.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 0001-fix-qemu-build-with-xen-4.18.0.patch diff --git a/0001-fix-qemu-build-with-xen-4.18.0.patch b/0001-fix-qemu-build-with-xen-4.18.0.patch new file mode 100644 index 0000000..ec716ac --- /dev/null +++ b/0001-fix-qemu-build-with-xen-4.18.0.patch @@ -0,0 +1,26 @@ +From 3a2e5ecdde13bc4eb7f173f6cb36b1a6c752aa1f Mon Sep 17 00:00:00 2001 +Message-ID: <3a2e5ecdde13bc4eb7f173f6cb36b1a6c752aa1f.1701978796.git.m.a.young@durham.ac.uk> +From: Michael Young +Date: Thu, 7 Dec 2023 19:49:20 +0000 +Subject: [PATCH] fix qemu build with xen-4.18.0 + +--- + include/hw/xen/xen_native.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h +index 6f09c48823..04b1ef4d34 100644 +--- a/include/hw/xen/xen_native.h ++++ b/include/hw/xen/xen_native.h +@@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod, + } + #endif + +-#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 ++#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 41700 + #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) + #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) + #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index b14785b..326ffa7 100644 --- a/qemu.spec +++ b/qemu.spec @@ -373,6 +373,9 @@ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz # Fix pvh.img ld build failure on fedora rawhide Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch +# See https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01035.html +Patch: 0001-fix-qemu-build-with-xen-4.18.0.patch + Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules Source12: bridge.conf From c29054addb1ac9accd9f2c8cc3ace00195cc0974 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Dec 2023 14:36:49 +0000 Subject: [PATCH 16/21] Further fix for Xen 4.18 --- 0001-fix-qemu-build-with-xen-4.18.0.patch | 26 ------ ...ion-for-enabling-the-Xen-accelerator.patch | 83 +++++++++++++++++++ qemu.spec | 9 +- 3 files changed, 89 insertions(+), 29 deletions(-) delete mode 100644 0001-fix-qemu-build-with-xen-4.18.0.patch create mode 100644 0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch diff --git a/0001-fix-qemu-build-with-xen-4.18.0.patch b/0001-fix-qemu-build-with-xen-4.18.0.patch deleted file mode 100644 index ec716ac..0000000 --- a/0001-fix-qemu-build-with-xen-4.18.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3a2e5ecdde13bc4eb7f173f6cb36b1a6c752aa1f Mon Sep 17 00:00:00 2001 -Message-ID: <3a2e5ecdde13bc4eb7f173f6cb36b1a6c752aa1f.1701978796.git.m.a.young@durham.ac.uk> -From: Michael Young -Date: Thu, 7 Dec 2023 19:49:20 +0000 -Subject: [PATCH] fix qemu build with xen-4.18.0 - ---- - include/hw/xen/xen_native.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h -index 6f09c48823..04b1ef4d34 100644 ---- a/include/hw/xen/xen_native.h -+++ b/include/hw/xen/xen_native.h -@@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod, - } - #endif - --#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 -+#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 41700 - #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) - #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) - #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 --- -2.43.0 - diff --git a/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch b/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch new file mode 100644 index 0000000..5be3634 --- /dev/null +++ b/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch @@ -0,0 +1,83 @@ +From 5fed25c696c0e32933d71b4133afe7856b82c11b Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Sat, 9 Dec 2023 15:32:22 +0100 +Subject: [PATCH] xen: fix condition for enabling the Xen accelerator +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A misspelled condition in xen_native.h is hiding a bug in the enablement of +Xen for qemu-system-aarch64. The bug becomes apparent when building for +Xen 4.18. + +While the i386 emulator provides the xenpv machine type for multiple architectures, +and therefore can be compiled with Xen enabled even when the host is Arm, the +opposite is not true: qemu-system-aarch64 can only be compiled with Xen support +enabled when the host is Arm. + +Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what is +already there for KVM, and fix xen_native.h. + +Cc: Stefano Stabellini +Cc: Richard W.M. Jones +Cc: Daniel P. Berrangé +Reported-by: Michael Young +Supersedes: <277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.young@durham.ac.uk> +Signed-off-by: Paolo Bonzini +--- + include/hw/xen/xen_native.h | 2 +- + meson.build | 17 ++++++++++------- + 2 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h +index 6f09c48823..1a5ad693a4 100644 +--- a/include/hw/xen/xen_native.h ++++ b/include/hw/xen/xen_native.h +@@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod, + } + #endif + +-#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 ++#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41700 + #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) + #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) + #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 +diff --git a/meson.build b/meson.build +index d2c4c2adb3..6c77d9687d 100644 +--- a/meson.build ++++ b/meson.build +@@ -123,21 +123,24 @@ if get_option('kvm').allowed() and targetos == 'linux' + kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' + endif + config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) +- + accelerator_targets = { 'CONFIG_KVM': kvm_targets } + ++if cpu in ['x86', 'x86_64'] ++ xen_targets = ['i386-softmmu', 'x86_64-softmmu'] ++elif cpu in ['arm', 'aarch64'] ++ # i386 emulator provides xenpv machine type for multiple architectures ++ xen_targets = ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'] ++else ++ xen_targets = [] ++endif ++accelerator_targets += { 'CONFIG_XEN': xen_targets } ++ + if cpu in ['aarch64'] + accelerator_targets += { + 'CONFIG_HVF': ['aarch64-softmmu'] + } + endif + +-if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] +- # i386 emulator provides xenpv machine type for multiple architectures +- accelerator_targets += { +- 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], +- } +-endif + if cpu in ['x86', 'x86_64'] + accelerator_targets += { + 'CONFIG_HVF': ['x86_64-softmmu'], +-- +2.41.0 + diff --git a/qemu.spec b/qemu.spec index 326ffa7..fb3ba1d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -357,7 +357,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.2 +%global baserelease 0.3 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -373,8 +373,8 @@ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz # Fix pvh.img ld build failure on fedora rawhide Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch -# See https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01035.html -Patch: 0001-fix-qemu-build-with-xen-4.18.0.patch +# See https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01165.html +Patch: 0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules @@ -3125,6 +3125,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Sat Dec 9 2023 Richard W.M. Jones - 2:8.2.0-0.3.rc2 +- Further fix for Xen 4.18 + * Tue Dec 05 2023 Richard W.M. Jones - 2:8.2.0-0.2.rc2 - Bump and rebuild for xen 4.18.0 From da8e31c4fc0888b993825fff59d017f0178d5e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Jan 2024 17:27:28 +0000 Subject: [PATCH 17/21] Trim changelogs older than 2 years MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- qemu.spec | 130 ------------------------------------------------------ 1 file changed, 130 deletions(-) diff --git a/qemu.spec b/qemu.spec index fb3ba1d..66c788e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -3273,133 +3273,3 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ * Tue Jan 11 2022 Richard W.M. Jones - 2:6.2.0-2 - Bump release and rebuild for new xen - -* Wed Dec 15 2021 Eduardo Lima (Etrunko) - 6.2.0-1 -- Rebase to qemu 6.2.0 - -* Thu Dec 09 2021 Eduardo Lima (Etrunko) - 6.2.0-0.1-rc4 -- Rebase to qemu 6.2.0-rc4 - -* Fri Dec 03 2021 Eduardo Lima (Etrunko) - 6.2.0-0.1-rc3 -- Rebase to qemu 6.2.0-rc3 - -* Thu Nov 25 2021 Daniel P. Berrangé - 6.1.0-13 -- Fix iovec limits with scsi-generic - -* Wed Nov 24 2021 Richard W.M. Jones - 6.1.0-12 -- Add support for qemu-nbd --selinux-relabel option (RHBZ#1984938) -- Define STAP_SDT_ARG_CONSTRAINT=g on %%{arm}, workaround for: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103395 - -* Mon Nov 08 2021 Adam Williamson - 6.1.0-10 -- Fix snapshot creation with qxl graphics - -* Fri Oct 08 2021 Cole Robinson - 6.1.0-9 -- Fix tcg PVH test with binutils 2.36+ - -* Wed Oct 06 2021 Cole Robinson - 6.1.0-8 -- Fix qemu crash with vnc + libvirt virDomainOpenConsole - -* Sun Sep 12 2021 Richard W.M. Jones - 6.1.0-7 -- Alternate fix for assertion on armv7hl (RHBZ#1999878) - -* Wed Sep 01 2021 Richard W.M. Jones - 6.1.0-6 -- Fix assertion on armv7hl (RHBZ#1999878) - -* Tue Aug 31 2021 Richard W.M. Jones - 6.1.0-5 -- Fix -cpu max (RHBZ#1999700) - -* Fri Aug 27 2021 Richard W.M. Jones - 6.1.0-4 -- Disable gcrypt (for real this time). - -* Fri Aug 27 2021 Richard W.M. Jones - 6.1.0-3 -- Revert "Disable gcrypt" which seems to disable gnutls (RHBZ#1998452) - -* Thu Aug 26 2021 Richard W.M. Jones - 6.1.0-2 -- Fix dependency pci_gl -> pci-gl and vga_gl -> vga-gl (RHBZ#1997855) - -* Tue Aug 24 2021 Eduardo Lima (Etrunko) - 6.1.0-1 -- Rebase to qemu 6.1.0 - -* Tue Aug 10 2021 Eduardo Lima (Etrunko) - 6.1.0-0.3-rc4 -- Rebase to qemu 6.1.0-rc4 - -* Tue Aug 10 2021 Eduardo Lima (Etrunko) - 6.1.0-0.2-rc3 -- Rebase to qemu 6.1.0-rc3 - -* Mon Aug 9 2021 Eduardo Lima (Etrunko) - 6.1.0-0.1-rc2 -- Rebase to qemu 6.1.0-rc2 - -* Thu Jul 29 2021 Cole Robinson - 6.0.0-12 -- Drop python3 shebang fixup for tests rpm -- Parallelize make check -- Explicitly disable c++ build - -* Fri Jul 23 2021 Richard W.M. Jones - 6.0.0-11 -- Fix dependencies of qemu metapackage. - -* Fri Jul 23 2021 Fedora Release Engineering - 2:6.0.0-10.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 18 2021 Cole Robinson - 6.0.0-10 -- Split out qemu-pr-helper and qemu-tools subpackages - -* Wed Jul 07 2021 Cole Robinson - 6.0.0-9 -- Use standard fedora build macros -- Access roms directly in ipxe, seabios, seavgabios directories - -* Wed Jun 30 2021 Cole Robinson - 6.0.0-8 -- Relax meson version to fix building on older Fedora -- More attempts to get CI working - -* Wed Jun 23 2021 Cole Robinson - 6.0.0-7 -- Add qemu-tests package -- Move qemu-sanity-check test to fedora CI -- Add s390x and generic kvm modprobe file from RHEL -- Add vhost modprobe file from RHEL -- Distribute tracetool, simpletrace, dump-guest-memory tools - -* Wed Jun 16 2021 Cole Robinson - 6.0.0-6 -- Build against fuse3 and SDL2_image -- Move qemu-storage-daemon to qemu-img subpackage - -* Mon Jun 07 2021 Cole Robinson - 6.0.0-5 -- Rebuild for xen 4.15 - -* Tue Jun 01 2021 Cole Robinson - 2:6.0.0-4 -- Split out qemu-device-display-vhost-user-gpu subpackage -- Split out qemu-docs subpackage - -* Wed May 19 2021 Paolo Bonzini - 2:6.0.0-3 -- add another patch to fix configuration files - -* Wed May 19 2021 Paolo Bonzini - 2:6.0.0-2 -- fix spice option from configuration file -- fix object option from configuration file -- allow not specifying size in -m when using -M memory-backend - -* Wed May 12 2021 Cole Robinson - 2:6.0.0-1 -- Rebase to qemu 6.0.0 GA - -* Wed Apr 21 2021 Cole Robinson - 2:6.0.0-0.3.rc4 -- Rebase to qemu 6.0.0-rc4 - -* Wed Apr 14 2021 Richard W.M. Jones - 2:6.0.0-0.2.rc2 -- Rebuild for updated liburing. - -* Tue Apr 06 2021 Cole Robinson - 6.0.0-0.1.rc2 -- Rebase to qemu 6.0.0-rc2 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2:5.2.0-6.1 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Mon Mar 01 2021 Cole Robinson - 5.2.0-6 -- Fix building on centos stream in copr - -* Wed Jan 27 2021 Fedora Release Engineering - 2:5.2.0-5.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Paolo Bonzini - 2:5.2.0-5 -- Use symlink for qemu-kvm. -- Fix make check on bash 5.1. From 1c471d38bc71041e6537d9468a055e751708eae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Jan 2024 17:29:58 +0000 Subject: [PATCH 18/21] Update to 8.2.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- ...ion-for-enabling-the-Xen-accelerator.patch | 83 ------------------- qemu.spec | 9 +- sources | 2 +- 3 files changed, 6 insertions(+), 88 deletions(-) delete mode 100644 0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch diff --git a/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch b/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch deleted file mode 100644 index 5be3634..0000000 --- a/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 5fed25c696c0e32933d71b4133afe7856b82c11b Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Sat, 9 Dec 2023 15:32:22 +0100 -Subject: [PATCH] xen: fix condition for enabling the Xen accelerator -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A misspelled condition in xen_native.h is hiding a bug in the enablement of -Xen for qemu-system-aarch64. The bug becomes apparent when building for -Xen 4.18. - -While the i386 emulator provides the xenpv machine type for multiple architectures, -and therefore can be compiled with Xen enabled even when the host is Arm, the -opposite is not true: qemu-system-aarch64 can only be compiled with Xen support -enabled when the host is Arm. - -Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what is -already there for KVM, and fix xen_native.h. - -Cc: Stefano Stabellini -Cc: Richard W.M. Jones -Cc: Daniel P. Berrangé -Reported-by: Michael Young -Supersedes: <277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.young@durham.ac.uk> -Signed-off-by: Paolo Bonzini ---- - include/hw/xen/xen_native.h | 2 +- - meson.build | 17 ++++++++++------- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h -index 6f09c48823..1a5ad693a4 100644 ---- a/include/hw/xen/xen_native.h -+++ b/include/hw/xen/xen_native.h -@@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod, - } - #endif - --#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 -+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41700 - #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) - #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) - #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 -diff --git a/meson.build b/meson.build -index d2c4c2adb3..6c77d9687d 100644 ---- a/meson.build -+++ b/meson.build -@@ -123,21 +123,24 @@ if get_option('kvm').allowed() and targetos == 'linux' - kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' - endif - config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) -- - accelerator_targets = { 'CONFIG_KVM': kvm_targets } - -+if cpu in ['x86', 'x86_64'] -+ xen_targets = ['i386-softmmu', 'x86_64-softmmu'] -+elif cpu in ['arm', 'aarch64'] -+ # i386 emulator provides xenpv machine type for multiple architectures -+ xen_targets = ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'] -+else -+ xen_targets = [] -+endif -+accelerator_targets += { 'CONFIG_XEN': xen_targets } -+ - if cpu in ['aarch64'] - accelerator_targets += { - 'CONFIG_HVF': ['aarch64-softmmu'] - } - endif - --if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] -- # i386 emulator provides xenpv machine type for multiple architectures -- accelerator_targets += { -- 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], -- } --endif - if cpu in ['x86', 'x86_64'] - accelerator_targets += { - 'CONFIG_HVF': ['x86_64-softmmu'], --- -2.41.0 - diff --git a/qemu.spec b/qemu.spec index 66c788e..ee69a7d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -350,14 +350,14 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -%global rcver rc2 +#global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.3 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -373,8 +373,6 @@ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz # Fix pvh.img ld build failure on fedora rawhide Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch -# See https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01165.html -Patch: 0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules @@ -3125,6 +3123,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Jan 9 2024 Daniel P. Berrangé - 8.2.0-1 +- Update to 8.2.0 release + * Sat Dec 9 2023 Richard W.M. Jones - 2:8.2.0-0.3.rc2 - Further fix for Xen 4.18 diff --git a/sources b/sources index 5f93671..a38f0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-8.2.0-rc2.tar.xz) = d9385840599c66e9ab0e36509a1242dcf9db33f8a4d1971e078bcc645b75c792cdfd3470d98ccafc2f52da5b048eff4dc97c6092df5d359569cdabb1e2878bbf +SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c From e1b58db1d607a95756969aaf15b88d4694081b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Jan 2024 17:30:47 +0000 Subject: [PATCH 19/21] Fix glitches in SPICE + virtio-vga updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2256884 Signed-off-by: Daniel P. Berrangé --- ....h-fix-qemu_rect_init-mis-assignment.patch | 36 +++++++++++++++++++ qemu.spec | 3 ++ 2 files changed, 39 insertions(+) create mode 100644 0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch diff --git a/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch b/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch new file mode 100644 index 0000000..9ca46b6 --- /dev/null +++ b/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch @@ -0,0 +1,36 @@ +From 9d5b42beb6978dc6219d5dc029c9d453c6b8d503 Mon Sep 17 00:00:00 2001 +From: Elen Avan +Date: Fri, 22 Dec 2023 22:17:21 +0300 +Subject: [PATCH] include/ui/rect.h: fix qemu_rect_init() mis-assignment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Elen Avan +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2051 +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2050 +Fixes: a200d53b1fde "virtio-gpu: replace PIXMAN for region/rect test" +Cc: qemu-stable@nongnu.org +Reviewed-by: Michael Tokarev +Reviewed-by: Marc-André Lureau +Signed-off-by: Michael Tokarev +--- + include/ui/rect.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/ui/rect.h b/include/ui/rect.h +index 94898f92d0..68f05d78a8 100644 +--- a/include/ui/rect.h ++++ b/include/ui/rect.h +@@ -19,7 +19,7 @@ static inline void qemu_rect_init(QemuRect *rect, + uint16_t width, uint16_t height) + { + rect->x = x; +- rect->y = x; ++ rect->y = y; + rect->width = width; + rect->height = height; + } +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index ee69a7d..b93dac5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -374,6 +374,9 @@ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2256884 +Patch: 0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch + Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules Source12: bridge.conf From cb4378cf142fa1f560d8b0a9ea72d637e0ebcb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Jan 2024 17:46:39 +0000 Subject: [PATCH 20/21] Add gpg verification of sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- .gitignore | 1 + ...-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg | Bin 0 -> 1890 bytes qemu.spec | 10 +++++++++- sources | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg diff --git a/.gitignore b/.gitignore index 1563109..9faf207 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /x86_64/ /*.src.rpm /qemu-*.tar.xz +/qemu-*.tar.xz.sig diff --git a/gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg b/gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg new file mode 100644 index 0000000000000000000000000000000000000000..a2590c0c6110a3d52f2171f7759e49282c742f19 GIT binary patch literal 1890 zcma*ncQ_je1IO_sRH8<#S`j3?w471nYE`+$wS-!=S4kukL5;*{C`D;GyK3(}N>P=l zaZ;69=d3GgytSIBO{JXo-uHRm=e<79{c(T&{{K9`=lcxE!*1nn2n9j_B^l9I-Wj>o zEERR~IVdJ>Rb-q6BKZm@W8;>H=8~)X-=V}_>aUdSkSVMGOdtP=txwUc)$vNL`~A!d z;JL21>rT~A2s0t<)B=i&|3FFk36cPAt>5O@r5g1HtPKz#RhIATmLs{K)6`mBYi$4qeLOQh?$-`D?S=in1LiU8csFC7P=#Z z40Rq@GX0U#52rg-mR*)%>aHN0N5&R=8f@k_w<#v z@(=cs*7L*O`(q74f;~y@LCT)k5dB1;7P}x21VEkx{TmJhW8>iBgn-#V92X!U&huRC z!XP#vND>GVi3XhKdUZqY3JV*UQ$lcYj&KnrhE zu5@32M5pTOAI%7>p(jG|MP-2$JNkQ<7#(wplopcQYXo^=a0Sgf%Jhmhpyb|%mH}@r zZYuHf?HN*Wm3YQYKt6i&IRGF#74gWy;x61dFH8GaH*vUTMZwkFQ0L?*RBlYda28&{ zM;geudPq!riGX9bj*RQ7rPMAKd<@KWv2QFyG!fp!bVCj>7oXiijm4@ngNgTr#$4>e zOlWlFw+&WRNs`zR<@-UeB5t=LzQx7)hWG?|g%Awze(v7B${2sYZ*_lg{kyt9;lXEq zrZR}8$^@&cW8gf%zI+E>(^0eSNCpot=q^WvDncS9H@ttn$W(MT7Ui?<~ zzt{EkCWMfbLkXV2%HAG+e}Vk{-$l+I1D}z5cuqxySc6281RfD{rn{*x48%A;xN}6S<|^nAF)BPMDuoEA$)6gg3T{a>897!exH*vjHt@jy%(0%jO*zZaj(BT z7U4+W(=M8Hx~5d<1Cal^M)7Ug?HxYF$X-1ilryot+ivrnzGd?{xNPYGHUZ(D-%_<+tQw=_R2!ASf?30VBbc!X#2JfXb z@UoA7zNl24_tA3MGiNz%f(h;L?4=PpB_3Y$pEaL8Jj`Y`7-8U|3bIGeov{_xs*>s4 z2V0|Ij_^B1wM<_%PF^m}y>4EUUC`->1Z zyEXsj% literal 0 HcmV?d00001 diff --git a/qemu.spec b/qemu.spec index b93dac5..f5b1f4f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -367,7 +367,11 @@ Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 URL: http://www.qemu.org/ -Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz +%global dlurl https://download.qemu.org + +Source0: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz +Source1: %{dlurl}/https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz.sig +Source2: gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg # https://patchwork.kernel.org/project/qemu-devel/patch/20231128143647.847668-1-crobinso@redhat.com/ # Fix pvh.img ld build failure on fedora rawhide @@ -388,6 +392,7 @@ Source30: kvm-s390x.conf Source31: kvm-x86.conf Source36: README.tests +BuildRequires: gnupg2 BuildRequires: meson >= %{meson_version} BuildRequires: bison BuildRequires: flex @@ -1497,6 +1502,8 @@ This package provides the QEMU system emulator for Xtensa boards. %prep +gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} + %autosetup -n qemu-%{version}%{?rcstr} -S git_am %global qemu_kvm_build qemu_kvm_build @@ -3128,6 +3135,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog * Tue Jan 9 2024 Daniel P. Berrangé - 8.2.0-1 - Update to 8.2.0 release +- Add gpg verification of source tarball * Sat Dec 9 2023 Richard W.M. Jones - 2:8.2.0-0.3.rc2 - Further fix for Xen 4.18 diff --git a/sources b/sources index a38f0b3..ce81ee2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c +SHA512 (qemu-8.2.0.tar.xz.sig) = 05412219ab0ff145f56708f99bc60b378b2b9ef6fbf3c48bffd32a2952188b2ee34a798949b09d6d8fc9f2483094fa0e3b488f52f69508604747ad4e2960f302 From 22512f545ba536f54a26883fd0d52ef446d3b201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 9 Jan 2024 17:46:39 +0000 Subject: [PATCH 21/21] Fix source URL mistake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index f5b1f4f..fa7eac9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -370,7 +370,7 @@ URL: http://www.qemu.org/ %global dlurl https://download.qemu.org Source0: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz -Source1: %{dlurl}/https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz.sig +Source1: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz.sig Source2: gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg # https://patchwork.kernel.org/project/qemu-devel/patch/20231128143647.847668-1-crobinso@redhat.com/