Commit 17fc7e93 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

i386: use ROUND_UP macro 

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



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

target/i386/arch_dump.c

+8 −8
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction f, 
    note->n_descsz = cpu_to_le32(descsz);

    note->n_type = cpu_to_le32(NT_PRSTATUS);

    buf = (char *)note;

    buf += ((sizeof(Elf64_Nhdr) + 3) / 4) * 4;

    buf += ROUND_UP(sizeof(Elf64_Nhdr), 4);

    memcpy(buf, name, name_size);

    buf += ((name_size + 3) / 4) * 4;

    buf += ROUND_UP(name_size, 4);

    memcpy(buf + 32, &id, 4); /* pr_pid */

    buf += descsz - sizeof(x86_64_user_regs_struct)-sizeof(target_ulong);

    memcpy(buf, &regs, sizeof(x86_64_user_regs_struct));
@@ -163,9 +163,9 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f, CPUX86State *env, 
    note->n_descsz = cpu_to_le32(descsz);

    note->n_type = cpu_to_le32(NT_PRSTATUS);

    buf = (char *)note;

    buf += ((sizeof(Elf64_Nhdr) + 3) / 4) * 4;

    buf += ROUND_UP(sizeof(Elf64_Nhdr), 4);

    memcpy(buf, name, name_size);

    buf += ((name_size + 3) / 4) * 4;

    buf += ROUND_UP(name_size, 4);

    memcpy(buf, &prstatus, sizeof(prstatus));



    ret = f(note, note_size, opaque);
@@ -218,9 +218,9 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, 
    note->n_descsz = cpu_to_le32(descsz);

    note->n_type = cpu_to_le32(NT_PRSTATUS);

    buf = (char *)note;

    buf += ((sizeof(Elf32_Nhdr) + 3) / 4) * 4;

    buf += ROUND_UP(sizeof(Elf32_Nhdr), 4);

    memcpy(buf, name, name_size);

    buf += ((name_size + 3) / 4) * 4;

    buf += ROUND_UP(name_size, 4);

    memcpy(buf, &prstatus, sizeof(prstatus));



    ret = f(note, note_size, opaque);
@@ -353,9 +353,9 @@ static inline int cpu_write_qemu_note(WriteCoreDumpFunction f, 
        note64->n_type = 0;

    }

    buf = note;

    buf += ((note_head_size + 3) / 4) * 4;

    buf += ROUND_UP(note_head_size, 4);

    memcpy(buf, name, name_size);

    buf += ((name_size + 3) / 4) * 4;

    buf += ROUND_UP(name_size, 4);

    memcpy(buf, &state, sizeof(state));



    ret = f(note, note_size, opaque);