Commit 6a519918 authored by qiaonuohan's avatar qiaonuohan Committed by Luiz Capitulino
Browse files

dump: add argument to write_elfxx_notes 



write_elf32_notes/wirte_elf64_notes use fd_write_vmcore to write elf notes to
vmcore. Adding parameter "WriteCoreDumpFunction f" makes it available to choose
the method of writing elf notes

Signed-off-by: default avatarQiao Nuohan <qiaonuohan@cn.fujitsu.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent b5ba1cc6

dump.c

+8 −8
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static inline int cpu_index(CPUState *cpu) 
    return cpu->cpu_index + 1;

}



static int write_elf64_notes(DumpState *s)

static int write_elf64_notes(WriteCoreDumpFunction f, DumpState *s)

{

    CPUState *cpu;

    int ret;
@@ -279,7 +279,7 @@ static int write_elf64_notes(DumpState *s) 


    CPU_FOREACH(cpu) {

        id = cpu_index(cpu);

        ret = cpu_write_elf64_note(fd_write_vmcore, cpu, id, s);

        ret = cpu_write_elf64_note(f, cpu, id, s);

        if (ret < 0) {

            dump_error(s, "dump: failed to write elf notes.\n");

            return -1;
@@ -287,7 +287,7 @@ static int write_elf64_notes(DumpState *s) 
    }



    CPU_FOREACH(cpu) {

        ret = cpu_write_elf64_qemunote(fd_write_vmcore, cpu, s);

        ret = cpu_write_elf64_qemunote(f, cpu, s);

        if (ret < 0) {

            dump_error(s, "dump: failed to write CPU status.\n");

            return -1;
@@ -321,7 +321,7 @@ static int write_elf32_note(DumpState *s) 
    return 0;

}



static int write_elf32_notes(DumpState *s)

static int write_elf32_notes(WriteCoreDumpFunction f, DumpState *s)

{

    CPUState *cpu;

    int ret;
@@ -329,7 +329,7 @@ static int write_elf32_notes(DumpState *s) 


    CPU_FOREACH(cpu) {

        id = cpu_index(cpu);

        ret = cpu_write_elf32_note(fd_write_vmcore, cpu, id, s);

        ret = cpu_write_elf32_note(f, cpu, id, s);

        if (ret < 0) {

            dump_error(s, "dump: failed to write elf notes.\n");

            return -1;
@@ -337,7 +337,7 @@ static int write_elf32_notes(DumpState *s) 
    }



    CPU_FOREACH(cpu) {

        ret = cpu_write_elf32_qemunote(fd_write_vmcore, cpu, s);

        ret = cpu_write_elf32_qemunote(f, cpu, s);

        if (ret < 0) {

            dump_error(s, "dump: failed to write CPU status.\n");

            return -1;
@@ -574,7 +574,7 @@ static int dump_begin(DumpState *s) 
        }



        /* write notes to vmcore */

        if (write_elf64_notes(s) < 0) {

        if (write_elf64_notes(fd_write_vmcore, s) < 0) {

            return -1;

        }
@@ -597,7 +597,7 @@ static int dump_begin(DumpState *s) 
        }



        /* write notes to vmcore */

        if (write_elf32_notes(s) < 0) {

        if (write_elf32_notes(fd_write_vmcore, s) < 0) {

            return -1;

        }

    }