{"id":808188,"url":"http://patchwork.ozlabs.org/api/patches/808188/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831103432.6007-27-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831103432.6007-27-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-08-31T10:34:29","name":"[PULL,26/29] i386: introduce ELF_NOTE_SIZE macro","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8392d2bdd0a77a70a49ed2f03f133897854af8e8","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831103432.6007-27-marcandre.lureau@redhat.com/mbox/","series":[{"id":788,"url":"http://patchwork.ozlabs.org/api/series/788/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=788","date":"2017-08-31T10:34:03","name":"[PULL,01/29] i386: use ROUND_UP macro","version":1,"mbox":"http://patchwork.ozlabs.org/series/788/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808188/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808188/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjfWJ4Ymgz9sQl\n\tfor ;\n\tThu, 31 Aug 2017 20:58:52 +1000 (AEST)","from localhost ([::1]:54982 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnNBS-0000Uy-K6\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 06:58:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41995)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnMpv-00035W-Dd\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:36:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnMpu-0006e8-Fh\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:36:35 -0400","from mx1.redhat.com ([209.132.183.28]:55062)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnMpu-0006d2-7V; Thu, 31 Aug 2017 06:36:34 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 3E3BF80F79;\n\tThu, 31 Aug 2017 10:36:33 +0000 (UTC)","from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id DD5B177DCE;\n\tThu, 31 Aug 2017 10:36:30 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3E3BF80F79","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","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","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tThu, 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]\n\t[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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"peter.maydell@linaro.org, Eduardo Habkost ,\n\tqemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t, Paolo Bonzini ,\n\tRichard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Factour out a common pattern to compute the ELF note size.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Eduardo Habkost \nReviewed-by: Richard Henderson \n---\n target/i386/arch_dump.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c\nindex e081f677fa..e682904052 100644\n--- a/target/i386/arch_dump.c\n+++ b/target/i386/arch_dump.c\n@@ -18,6 +18,11 @@\n #include \"elf.h\"\n #include \"sysemu/memory_mapping.h\"\n \n+#define ELF_NOTE_SIZE(hdr_size, name_size, desc_size) \\\n+ ((DIV_ROUND_UP((hdr_size), 4) \\\n+ + DIV_ROUND_UP((name_size), 4) \\\n+ + DIV_ROUND_UP((desc_size), 4)) * 4)\n+\n #ifdef TARGET_X86_64\n typedef struct {\n target_ulong r15, r14, r13, r12, rbp, rbx, r11, r10;\n@@ -77,8 +82,7 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction f,\n regs.gs = env->segs[R_GS].selector;\n \n descsz = sizeof(x86_64_elf_prstatus);\n- note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +\n- DIV_ROUND_UP(descsz, 4)) * 4;\n+ note_size = ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz);\n note = g_malloc0(note_size);\n note->n_namesz = cpu_to_le32(name_size);\n note->n_descsz = cpu_to_le32(descsz);\n@@ -156,8 +160,7 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f, CPUX86State *env,\n \n x86_fill_elf_prstatus(&prstatus, env, id);\n descsz = sizeof(x86_elf_prstatus);\n- note_size = (DIV_ROUND_UP(sizeof(Elf64_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +\n- DIV_ROUND_UP(descsz, 4)) * 4;\n+ note_size = ELF_NOTE_SIZE(sizeof(Elf64_Nhdr), name_size, descsz);\n note = g_malloc0(note_size);\n note->n_namesz = cpu_to_le32(name_size);\n note->n_descsz = cpu_to_le32(descsz);\n@@ -211,8 +214,7 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,\n \n x86_fill_elf_prstatus(&prstatus, &cpu->env, cpuid);\n descsz = sizeof(x86_elf_prstatus);\n- note_size = (DIV_ROUND_UP(sizeof(Elf32_Nhdr), 4) + DIV_ROUND_UP(name_size, 4) +\n- DIV_ROUND_UP(descsz, 4)) * 4;\n+ note_size = ELF_NOTE_SIZE(sizeof(Elf32_Nhdr), name_size, descsz);\n note = g_malloc0(note_size);\n note->n_namesz = cpu_to_le32(name_size);\n note->n_descsz = cpu_to_le32(descsz);\n@@ -443,10 +445,8 @@ ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)\n #endif\n qemu_desc_size = sizeof(QEMUCPUState);\n \n- elf_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +\n- DIV_ROUND_UP(elf_desc_size, 4)) * 4;\n- qemu_note_size = (DIV_ROUND_UP(note_head_size, 4) + DIV_ROUND_UP(name_size, 4) +\n- DIV_ROUND_UP(qemu_desc_size, 4)) * 4;\n+ elf_note_size = ELF_NOTE_SIZE(note_head_size, name_size, elf_desc_size);\n+ qemu_note_size = ELF_NOTE_SIZE(note_head_size, name_size, qemu_desc_size);\n \n return (elf_note_size + qemu_note_size) * nr_cpus;\n }\n","prefixes":["PULL","26/29"]}