From nobody Wed Nov 5 08:31:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504177197232448.7314307186748; Thu, 31 Aug 2017 03:59:57 -0700 (PDT) Received: from localhost ([::1]:54986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnNCV-0001Zy-6R for importer@patchew.org; Thu, 31 Aug 2017 06:59:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnMpv-00035W-Dd for qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:36:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnMpu-0006e8-Fh for qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:36:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55062) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnMpu-0006d2-7V; Thu, 31 Aug 2017 06:36:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3E3BF80F79; Thu, 31 Aug 2017 10:36:33 +0000 (UTC) Received: from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD5B177DCE; Thu, 31 Aug 2017 10:36:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3E3BF80F79 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 31 Aug 2017 12:34:29 +0200 Message-Id: <20170831103432.6007-27-marcandre.lureau@redhat.com> In-Reply-To: <20170831103432.6007-1-marcandre.lureau@redhat.com> References: <20170831103432.6007-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 31 Aug 2017 10:36:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 26/29] i386: introduce ELF_NOTE_SIZE macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Eduardo Habkost , qemu-trivial@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Factour out a common pattern to compute the ELF note size. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eduardo Habkost Reviewed-by: Richard Henderson --- target/i386/arch_dump.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c index e081f677fa..e682904052 100644 --- a/target/i386/arch_dump.c +++ b/target/i386/arch_dump.c @@ -18,6 +18,11 @@ #include "elf.h" #include "sysemu/memory_mapping.h" =20 +#define ELF_NOTE_SIZE(hdr_size, name_size, desc_size) \ + ((DIV_ROUND_UP((hdr_size), 4) \ + + DIV_ROUND_UP((name_size), 4) \ + + DIV_ROUND_UP((desc_size), 4)) * 4) + #ifdef TARGET_X86_64 typedef struct { target_ulong r15, r14, r13, r12, rbp, rbx, r11, r10; @@ -77,8 +82,7 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction = f, regs.gs =3D env->segs[R_GS].selector; =20 descsz =3D sizeof(x86_64_elf_prstatus); - note_size =3D (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name= _size, 4) + - DIV_ROUND_UP(descsz, 4)) * 4; + note_size =3D ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz); note =3D g_malloc0(note_size); note->n_namesz =3D cpu_to_le32(name_size); note->n_descsz =3D cpu_to_le32(descsz); @@ -156,8 +160,7 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f= , CPUX86State *env, =20 x86_fill_elf_prstatus(&prstatus, env, id); descsz =3D sizeof(x86_elf_prstatus); - note_size =3D (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name= _size, 4) + - DIV_ROUND_UP(descsz, 4)) * 4; + note_size =3D ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz); note =3D g_malloc0(note_size); note->n_namesz =3D cpu_to_le32(name_size); note->n_descsz =3D cpu_to_le32(descsz); @@ -211,8 +214,7 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, C= PUState *cs, =20 x86_fill_elf_prstatus(&prstatus, &cpu->env, cpuid); descsz =3D sizeof(x86_elf_prstatus); - note_size =3D (DIV_ROUND_UP(sizeof(Elf32_Nhdr), 4) + DIV_ROUND_UP(name= _size, 4) + - DIV_ROUND_UP(descsz, 4)) * 4; + note_size =3D ELF_NOTE_SIZE(sizeof(Elf32_Nhdr), name_size, descsz); note =3D g_malloc0(note_size); note->n_namesz =3D cpu_to_le32(name_size); note->n_descsz =3D cpu_to_le32(descsz); @@ -443,10 +445,8 @@ ssize_t cpu_get_note_size(int class, int machine, int = nr_cpus) #endif qemu_desc_size =3D sizeof(QEMUCPUState); =20 - elf_note_size =3D (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name= _size, 4) + - DIV_ROUND_UP(elf_desc_size, 4)) * 4; - qemu_note_size =3D (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(nam= e_size, 4) + - DIV_ROUND_UP(qemu_desc_size, 4)) * 4; + elf_note_size =3D ELF_NOTE_SIZE(note_head_size, name_size, elf_desc_si= ze); + qemu_note_size =3D ELF_NOTE_SIZE(note_head_size, name_size, qemu_desc_= size); =20 return (elf_note_size + qemu_note_size) * nr_cpus; } --=20 2.14.1.146.gd35faa819