rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tcg PVH test with binutils 2.36+

Browse Source 
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2021-10-08 13:58:22 -04:00
parent 1d93f5191e
commit 7be05bc02d
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch Normal file
View File

@ -0,0 +1,40 @@
From 5ab2a54c262c61f64c22dbb49ade3e2db8a740bb Mon Sep 17 00:00:00 2001
Message-Id: <5ab2a54c262c61f64c22dbb49ade3e2db8a740bb.1633708346.git.crobinso@redhat.com>
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 8 Oct 2021 11:47:45 -0400
Subject: [PATCH] tests: tcg: Fix PVH test with binutils 2.36+
binutils started adding a .note.gnu.property ELF section which
makes the PVH test fail:
TEST hello on x86_64
qemu-system-x86_64: Error loading uncompressed kernel without PVH ELF Note
Discard .note.gnu* while keeping the PVH .note bits intact.
This also strips the build-id note, so drop the related comment.
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
tests/tcg/x86_64/system/kernel.ld | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/tcg/x86_64/system/kernel.ld b/tests/tcg/x86_64/system/kernel.ld
index 49c12b04ae..ca5d6bd850 100644
--- a/tests/tcg/x86_64/system/kernel.ld
+++ b/tests/tcg/x86_64/system/kernel.ld
@@ -16,7 +16,10 @@ SECTIONS {
*(.rodata)
} :text
- /* Keep build ID and PVH notes in same section */
+ /DISCARD/ : {
+ *(.note.gnu*)
+ }
+
.notes : {
*(.note.*)
} :note
--
2.32.0

7
qemu.spec
View File

@ -282,7 +282,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 6.1.0
Release: 8%{?rcrel}%{?dist}
Release: 9%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/
@ -310,6 +310,8 @@ Patch2: 0001-tcg-arm-Reduce-vector-alignment-requirement-for-NEON.patch
# Fix qemu crash with vnc + libvirt virDomainOpenConsole
Patch3: 0001-qemu-sockets-fix-unix-socket-path-copy-again.patch
# Fix tcg PVH test with binutils 2.36+
Patch4: 0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch
BuildRequires: meson >= %{meson_version}
BuildRequires: zlib-devel
@ -2239,6 +2241,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
* Fri Oct 08 2021 Cole Robinson <crobinso@redhat.com> - 6.1.0-9
- Fix tcg PVH test with binutils 2.36+
* Wed Oct 06 2021 Cole Robinson <crobinso@redhat.com> - 6.1.0-8
- Fix qemu crash with vnc + libvirt virDomainOpenConsole