Commit 074d5afe authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

i386/dump: use DIV_ROUND_UP 

I used the clang-tidy qemu-round check to generate the fix:
https://github.com/elmarco/clang-tools-extra



Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent f0704d78

target/i386/arch_dump.c

+12 −12
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction f, 
    regs.gs = env->segs[R_GS].selector;



    descsz = sizeof(x86_64_elf_prstatus);

    note_size = ((sizeof(Elf64_Nhdr) + 3) / 4 + (name_size + 3) / 4 +

                (descsz + 3) / 4) * 4;

    note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +

                DIV_ROUND_UP(descsz, 4)) * 4;

    note = g_malloc0(note_size);

    note->n_namesz = cpu_to_le32(name_size);

    note->n_descsz = cpu_to_le32(descsz);
@@ -156,8 +156,8 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f, CPUX86State *env, 


    x86_fill_elf_prstatus(&prstatus, env, id);

    descsz = sizeof(x86_elf_prstatus);

    note_size = ((sizeof(Elf64_Nhdr) + 3) / 4 + (name_size + 3) / 4 +

                (descsz + 3) / 4) * 4;

    note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +

                DIV_ROUND_UP(descsz, 4)) * 4;

    note = g_malloc0(note_size);

    note->n_namesz = cpu_to_le32(name_size);

    note->n_descsz = cpu_to_le32(descsz);
@@ -211,8 +211,8 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, 


    x86_fill_elf_prstatus(&prstatus, &cpu->env, cpuid);

    descsz = sizeof(x86_elf_prstatus);

    note_size = ((sizeof(Elf32_Nhdr) + 3) / 4 + (name_size + 3) / 4 +

                (descsz + 3) / 4) * 4;

    note_size = (DIV_ROUND_UP(sizeof(Elf32_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +

                DIV_ROUND_UP(descsz, 4)) * 4;

    note = g_malloc0(note_size);

    note->n_namesz = cpu_to_le32(name_size);

    note->n_descsz = cpu_to_le32(descsz);
@@ -338,8 +338,8 @@ static inline int cpu_write_qemu_note(WriteCoreDumpFunction f, 
    } else {

        note_head_size = sizeof(Elf64_Nhdr);

    }

    note_size = ((note_head_size + 3) / 4 + (name_size + 3) / 4 +

                (descsz + 3) / 4) * 4;

    note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +

                DIV_ROUND_UP(descsz, 4)) * 4;

    note = g_malloc0(note_size);

    if (type == 0) {

        note32 = note;
@@ -443,10 +443,10 @@ ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) 
#endif

    qemu_desc_size = sizeof(QEMUCPUState);



    elf_note_size = ((note_head_size + 3) / 4 + (name_size + 3) / 4 +

                     (elf_desc_size + 3) / 4) * 4;

    qemu_note_size = ((note_head_size + 3) / 4 + (name_size + 3) / 4 +

                      (qemu_desc_size + 3) / 4) * 4;

    elf_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +

                     DIV_ROUND_UP(elf_desc_size, 4)) * 4;

    qemu_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +

                      DIV_ROUND_UP(qemu_desc_size, 4)) * 4;



    return (elf_note_size + qemu_note_size) * nr_cpus;

}