qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, pbonzini@redhat.com
Subject: [PATCH v2 8/9] dump: Cleanup dump_begin write functions
Date: Thu, 10 Mar 2022 11:08:53 +0000	[thread overview]
Message-ID: <20220310110854.2701-9-frankja@linux.ibm.com> (raw)
In-Reply-To: <20220310110854.2701-1-frankja@linux.ibm.com>

There's no need to have a gigantic if in there let's move the elf
32/64 bit logic into the section, segment or note code.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 dump/dump.c | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/dump/dump.c b/dump/dump.c
index 1294673444..5542adf7b8 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -555,46 +555,26 @@ static void dump_begin(DumpState *s, Error **errp)
         return;
     }
 
-    if (dump_is_64bit(s)) {
-        /* write all PT_LOAD to vmcore */
-        write_elf_loads(s, errp);
+    /* write all PT_LOAD to vmcore */
+    write_elf_loads(s, errp);
+    if (*errp) {
+        return;
+    }
+
+    /* write section to vmcore */
+    if (s->shdr_num) {
+        write_elf_section(s, 1, errp);
         if (*errp) {
             return;
         }
+    }
 
-        /* write section to vmcore */
-        if (s->shdr_num) {
-            write_elf_section(s, 1, errp);
-            if (*errp) {
-                return;
-            }
-        }
-
+    if (dump_is_64bit(s)) {
         /* write notes to vmcore */
         write_elf64_notes(fd_write_vmcore, s, errp);
-        if (*errp) {
-            return;
-        }
     } else {
-        /* write all PT_LOAD to vmcore */
-        write_elf_loads(s, errp);
-        if (*errp) {
-            return;
-        }
-
-        /* write section to vmcore */
-        if (s->shdr_num) {
-            write_elf_section(s, 0, errp);
-            if (*errp) {
-                return;
-            }
-        }
-
         /* write notes to vmcore */
         write_elf32_notes(fd_write_vmcore, s, errp);
-        if (*errp) {
-            return;
-        }
     }
 }
 
-- 
2.32.0



  parent reply	other threads:[~2022-03-10 11:14 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 11:08 [PATCH v2 0/9] dump: Cleanup and consolidation Janosch Frank
2022-03-10 11:08 ` [PATCH v2 1/9] dump: Use ERRP_GUARD() Janosch Frank
2022-03-11 18:45   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 2/9] dump: Remove the sh_info variable Janosch Frank
2022-03-11 19:40   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 3/9] dump: Introduce shdr_num to decrease complexity Janosch Frank
2022-03-11 19:41   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 4/9] dump: Remove the section if when calculating the memory offset Janosch Frank
2022-03-11 19:42   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 5/9] dump: Add more offset variables Janosch Frank
2022-03-11 19:44   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 6/9] dump: Introduce dump_is_64bit() helper function Janosch Frank
2022-03-11 19:47   ` Richard Henderson
2022-03-10 11:08 ` [PATCH v2 7/9] dump: Consolidate phdr note writes Janosch Frank
2022-03-11 19:49   ` Richard Henderson
2022-03-10 11:08 ` Janosch Frank [this message]
2022-03-11 19:51   ` [PATCH v2 8/9] dump: Cleanup dump_begin write functions Richard Henderson
2022-03-10 11:08 ` [PATCH v2 9/9] dump: Consolidate elf note function Janosch Frank
2022-03-11 19:54   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220310110854.2701-9-frankja@linux.ibm.com \
    --to=frankja@linux.ibm.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).