{"id":808160,"url":"http://patchwork.ozlabs.org/api/patches/808160/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831103432.6007-2-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-2-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-08-31T10:34:04","name":"[PULL,01/29] i386: use ROUND_UP macro","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"07dd84b7e7bcecc68077cbb3f2bfcf78a3165aee","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-2-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/808160/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808160/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xjf0N4sr9z9sQl\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 20:35:32 +1000 (AEST)","from localhost ([::1]:54847 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnMos-000164-LC\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 06:35:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40588)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1dnMo6-00015O-PQ\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:34:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1dnMo5-0005CV-LV\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:34:42 -0400","from mx1.redhat.com ([209.132.183.28]:56388)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <marcandre.lureau@redhat.com>)\n\tid 1dnMo5-0005Bw-Cz; Thu, 31 Aug 2017 06:34:41 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 46001356D4;\n\tThu, 31 Aug 2017 10:34:40 +0000 (UTC)","from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C89799D5E7;\n\tThu, 31 Aug 2017 10:34:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 46001356D4","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Thu, 31 Aug 2017 12:34:04 +0200","Message-Id":"<20170831103432.6007-2-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.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 31 Aug 2017 10:34:40 +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 01/29] i386: use ROUND_UP macro","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"peter.maydell@linaro.org, Eduardo Habkost <ehabkost@redhat.com>,\n\tqemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t<marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,\n\tRichard Henderson <rth@twiddle.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"I used the clang-tidy qemu-round check (with the option OnlyAlignUp)\nto generate the fix:\nhttps://github.com/elmarco/clang-tools-extra\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Juan Quintela <quintela@redhat.com>\nAcked-by: Eduardo Habkost <ehabkost@redhat.com>\nReviewed-by: Richard Henderson <rth@twiddle.net>\n---\n target/i386/arch_dump.c | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)","diff":"diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c\nindex fe0aa36932..1d51bb5206 100644\n--- a/target/i386/arch_dump.c\n+++ b/target/i386/arch_dump.c\n@@ -84,9 +84,9 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction f,\n     note->n_descsz = cpu_to_le32(descsz);\n     note->n_type = cpu_to_le32(NT_PRSTATUS);\n     buf = (char *)note;\n-    buf += ((sizeof(Elf64_Nhdr) + 3) / 4) * 4;\n+    buf += ROUND_UP(sizeof(Elf64_Nhdr), 4);\n     memcpy(buf, name, name_size);\n-    buf += ((name_size + 3) / 4) * 4;\n+    buf += ROUND_UP(name_size, 4);\n     memcpy(buf + 32, &id, 4); /* pr_pid */\n     buf += descsz - sizeof(x86_64_user_regs_struct)-sizeof(target_ulong);\n     memcpy(buf, &regs, sizeof(x86_64_user_regs_struct));\n@@ -163,9 +163,9 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f, CPUX86State *env,\n     note->n_descsz = cpu_to_le32(descsz);\n     note->n_type = cpu_to_le32(NT_PRSTATUS);\n     buf = (char *)note;\n-    buf += ((sizeof(Elf64_Nhdr) + 3) / 4) * 4;\n+    buf += ROUND_UP(sizeof(Elf64_Nhdr), 4);\n     memcpy(buf, name, name_size);\n-    buf += ((name_size + 3) / 4) * 4;\n+    buf += ROUND_UP(name_size, 4);\n     memcpy(buf, &prstatus, sizeof(prstatus));\n \n     ret = f(note, note_size, opaque);\n@@ -218,9 +218,9 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,\n     note->n_descsz = cpu_to_le32(descsz);\n     note->n_type = cpu_to_le32(NT_PRSTATUS);\n     buf = (char *)note;\n-    buf += ((sizeof(Elf32_Nhdr) + 3) / 4) * 4;\n+    buf += ROUND_UP(sizeof(Elf32_Nhdr), 4);\n     memcpy(buf, name, name_size);\n-    buf += ((name_size + 3) / 4) * 4;\n+    buf += ROUND_UP(name_size, 4);\n     memcpy(buf, &prstatus, sizeof(prstatus));\n \n     ret = f(note, note_size, opaque);\n@@ -353,9 +353,9 @@ static inline int cpu_write_qemu_note(WriteCoreDumpFunction f,\n         note64->n_type = 0;\n     }\n     buf = note;\n-    buf += ((note_head_size + 3) / 4) * 4;\n+    buf += ROUND_UP(note_head_size, 4);\n     memcpy(buf, name, name_size);\n-    buf += ((name_size + 3) / 4) * 4;\n+    buf += ROUND_UP(name_size, 4);\n     memcpy(buf, &state, sizeof(state));\n \n     ret = f(note, note_size, opaque);\n","prefixes":["PULL","01/29"]}