summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2021-10-08 12:21:01 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2021-10-13 10:47:49 +0200
commit8e751e9c38e324737fd3d3aa0562f886313bba3c (patch)
tree7d650558721eb10f9c7285e60202ae4249416b75
parentf1279fc15bf4315fb8e103e6eabaee014ce1f914 (diff)
downloadfocaccia-qemu-8e751e9c38e324737fd3d3aa0562f886313bba3c.tar.gz
focaccia-qemu-8e751e9c38e324737fd3d3aa0562f886313bba3c.zip
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>
Message-Id: <5ab2a54c262c61f64c22dbb49ade3e2db8a740bb.1633708346.git.crobinso@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--tests/tcg/x86_64/system/kernel.ld5
1 files changed, 4 insertions, 1 deletions
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