From 7be05bc02d4175e801d00bd6c76adbb9e2cc54fe Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Oct 08 2021 20:17:17 +0000
Subject: Fix tcg PVH test with binutils 2.36+


Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch b/0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch
new file mode 100644
index 0000000..cf01f1b
--- /dev/null
+++ b/0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch
@@ -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
+
diff --git a/qemu.spec b/qemu.spec
index 92303f8..915e534 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -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