bf143f
From 6932fe3afbec443bbf6acff5b707536254e1bc37 Mon Sep 17 00:00:00 2001
bf143f
From: Janosch Frank <frankja@linux.ibm.com>
bf143f
Date: Mon, 17 Oct 2022 08:38:16 +0000
bf143f
Subject: [PATCH 35/42] dump: Reintroduce memory_offset and section_offset
bf143f
MIME-Version: 1.0
bf143f
Content-Type: text/plain; charset=UTF-8
bf143f
Content-Transfer-Encoding: 8bit
bf143f
bf143f
RH-Author: Cédric Le Goater <clg@redhat.com>
bf143f
RH-MergeRequest: 226: s390: Enhanced Interpretation for PCI Functions and Secure Execution guest dump
bf143f
RH-Bugzilla: 1664378 2043909
bf143f
RH-Acked-by: Thomas Huth <thuth@redhat.com>
bf143f
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
bf143f
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
bf143f
RH-Commit: [35/41] e60c0d066aeeedb42e724712bc3aa7b7591c6c79
bf143f
bf143f
section_offset will later be used to store the offset to the section
bf143f
data which will be stored last. For now memory_offset is only needed
bf143f
to make section_offset look nicer.
bf143f
bf143f
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
bf143f
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
bf143f
Message-Id: <20221017083822.43118-5-frankja@linux.ibm.com>
bf143f
(cherry picked from commit 13fd417ddc81a1685c6a8f4e1c80bbfe7150f164)
bf143f
Signed-off-by: Cédric Le Goater <clg@redhat.com>
bf143f
---
bf143f
 dump/dump.c | 2 ++
bf143f
 1 file changed, 2 insertions(+)
bf143f
bf143f
diff --git a/dump/dump.c b/dump/dump.c
bf143f
index d17537d4e9..7a42401790 100644
bf143f
--- a/dump/dump.c
bf143f
+++ b/dump/dump.c
bf143f
@@ -1885,6 +1885,8 @@ static void dump_init(DumpState *s, int fd, bool has_format,
bf143f
         s->phdr_offset = s->shdr_offset + sizeof(Elf32_Shdr) * s->shdr_num;
bf143f
         s->note_offset = s->phdr_offset + sizeof(Elf32_Phdr) * s->phdr_num;
bf143f
     }
bf143f
+    s->memory_offset = s->note_offset + s->note_size;
bf143f
+    s->section_offset = s->memory_offset + s->total_size;
bf143f
 
bf143f
     return;
bf143f
 
bf143f
-- 
bf143f
2.37.3
bf143f