[v2,9/9] dump: Consolidate elf note function

Commit Message

Janosch Frank March 10, 2022, 11:08 a.m. UTC

Just like with the other write functions let's move the 32/64 bit elf
handling to a function to improve readability.

Signed-off-by: Janosch Frank <[e-mail]>
---
 dump/dump.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

Comments

Richard Henderson March 11, 2022, 7:54 p.m. UTC | #1

On 3/10/22 03:08, Janosch Frank wrote:
> +static void write_elf_notes(DumpState *s, Error **errp)
> +{
> +    ERRP_GUARD();
> +
> +    if (dump_is_64bit(s)) {
> +        write_elf64_notes(fd_write_vmcore, s, errp);
> +    } else {
> +        write_elf32_notes(fd_write_vmcore, s, errp);
> +    }
> +    if (*errp) {
> +        return;
> +    }
> +}

Are you anticipating adding more code to this function?
Otherwise the early return, and the guard are useless.


r~

Patch

diff --git a/dump/dump.c b/dump/dump.c
index 5542adf7b8..ae8ec527de 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -510,6 +510,20 @@  static void write_elf_loads(DumpState *s, Error **errp)
     }
 }
 
+static void write_elf_notes(DumpState *s, Error **errp)
+{
+    ERRP_GUARD();
+
+    if (dump_is_64bit(s)) {
+        write_elf64_notes(fd_write_vmcore, s, errp);
+    } else {
+        write_elf32_notes(fd_write_vmcore, s, errp);
+    }
+    if (*errp) {
+        return;
+    }
+}
+
 /* write elf header, PT_NOTE and elf note to vmcore. */
 static void dump_begin(DumpState *s, Error **errp)
 {
@@ -569,13 +583,8 @@  static void dump_begin(DumpState *s, Error **errp)
         }
     }
 
-    if (dump_is_64bit(s)) {
-        /* write notes to vmcore */
-        write_elf64_notes(fd_write_vmcore, s, errp);
-    } else {
-        /* write notes to vmcore */
-        write_elf32_notes(fd_write_vmcore, s, errp);
-    }
+    /* write notes to vmcore */
+    write_elf_notes(s, errp);
 }
 
 static int get_next_block(DumpState *s, GuestPhysBlock *block)