mirror of
https://github.com/qemu/qemu.git
synced 2024-11-26 21:33:40 +08:00
linux-user: Drop image_info.alignment
This field is write-only. Use only the function-local variable within load_elf_image. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
c81d1fafa6
commit
dff406754e
@ -3220,7 +3220,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src,
|
||||
* amount of memory to handle that. Locate the interpreter, if any.
|
||||
*/
|
||||
loaddr = -1, hiaddr = 0;
|
||||
info->alignment = 0;
|
||||
align = 0;
|
||||
info->exec_stack = EXSTACK_DEFAULT;
|
||||
for (i = 0; i < ehdr->e_phnum; ++i) {
|
||||
struct elf_phdr *eppnt = phdr + i;
|
||||
@ -3234,7 +3234,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src,
|
||||
hiaddr = a;
|
||||
}
|
||||
++info->nsegs;
|
||||
info->alignment |= eppnt->p_align;
|
||||
align |= eppnt->p_align;
|
||||
} else if (eppnt->p_type == PT_INTERP && pinterp_name) {
|
||||
g_autofree char *interp_name = NULL;
|
||||
|
||||
@ -3264,8 +3264,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src,
|
||||
|
||||
load_addr = loaddr;
|
||||
|
||||
align = pow2ceil(info->alignment);
|
||||
info->alignment = align;
|
||||
align = pow2ceil(align);
|
||||
|
||||
if (pinterp_name != NULL) {
|
||||
if (ehdr->e_type == ET_EXEC) {
|
||||
|
@ -44,7 +44,6 @@ struct image_info {
|
||||
abi_ulong file_string;
|
||||
uint32_t elf_flags;
|
||||
int personality;
|
||||
abi_ulong alignment;
|
||||
bool exec_stack;
|
||||
|
||||
/* Generic semihosting knows about these pointers. */
|
||||
|
Loading…
Reference in New Issue
Block a user