From nobody Wed Nov 5 08:28:11 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 1504175806979718.2030355919187; Thu, 31 Aug 2017 03:36:46 -0700 (PDT) Received: from localhost ([::1]:54860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnMq4-0002j8-Ok for importer@patchew.org; Thu, 31 Aug 2017 06:36:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnMo6-00015O-PQ for qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:34:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnMo5-0005CV-LV for qemu-devel@nongnu.org; Thu, 31 Aug 2017 06:34:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnMo5-0005Bw-Cz; Thu, 31 Aug 2017 06:34:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46001356D4; Thu, 31 Aug 2017 10:34:40 +0000 (UTC) Received: from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id C89799D5E7; Thu, 31 Aug 2017 10:34:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 46001356D4 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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: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 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 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] [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: 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" 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: Marc-Andr=C3=A9 Lureau Reviewed-by: Juan Quintela Acked-by: Eduardo Habkost Reviewed-by: Richard Henderson --- target/i386/arch_dump.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c index fe0aa36932..1d51bb5206 100644 --- a/target/i386/arch_dump.c +++ b/target/i386/arch_dump.c @@ -84,9 +84,9 @@ static int x86_64_write_elf64_note(WriteCoreDumpFunction = f, note->n_descsz =3D cpu_to_le32(descsz); note->n_type =3D cpu_to_le32(NT_PRSTATUS); buf =3D (char *)note; - buf +=3D ((sizeof(Elf64_Nhdr) + 3) / 4) * 4; + buf +=3D ROUND_UP(sizeof(Elf64_Nhdr), 4); memcpy(buf, name, name_size); - buf +=3D ((name_size + 3) / 4) * 4; + buf +=3D ROUND_UP(name_size, 4); memcpy(buf + 32, &id, 4); /* pr_pid */ buf +=3D descsz - sizeof(x86_64_user_regs_struct)-sizeof(target_ulong); memcpy(buf, ®s, sizeof(x86_64_user_regs_struct)); @@ -163,9 +163,9 @@ static int x86_write_elf64_note(WriteCoreDumpFunction f= , CPUX86State *env, note->n_descsz =3D cpu_to_le32(descsz); note->n_type =3D cpu_to_le32(NT_PRSTATUS); buf =3D (char *)note; - buf +=3D ((sizeof(Elf64_Nhdr) + 3) / 4) * 4; + buf +=3D ROUND_UP(sizeof(Elf64_Nhdr), 4); memcpy(buf, name, name_size); - buf +=3D ((name_size + 3) / 4) * 4; + buf +=3D ROUND_UP(name_size, 4); memcpy(buf, &prstatus, sizeof(prstatus)); =20 ret =3D f(note, note_size, opaque); @@ -218,9 +218,9 @@ int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, C= PUState *cs, note->n_descsz =3D cpu_to_le32(descsz); note->n_type =3D cpu_to_le32(NT_PRSTATUS); buf =3D (char *)note; - buf +=3D ((sizeof(Elf32_Nhdr) + 3) / 4) * 4; + buf +=3D ROUND_UP(sizeof(Elf32_Nhdr), 4); memcpy(buf, name, name_size); - buf +=3D ((name_size + 3) / 4) * 4; + buf +=3D ROUND_UP(name_size, 4); memcpy(buf, &prstatus, sizeof(prstatus)); =20 ret =3D f(note, note_size, opaque); @@ -353,9 +353,9 @@ static inline int cpu_write_qemu_note(WriteCoreDumpFunc= tion f, note64->n_type =3D 0; } buf =3D note; - buf +=3D ((note_head_size + 3) / 4) * 4; + buf +=3D ROUND_UP(note_head_size, 4); memcpy(buf, name, name_size); - buf +=3D ((name_size + 3) / 4) * 4; + buf +=3D ROUND_UP(name_size, 4); memcpy(buf, &state, sizeof(state)); =20 ret =3D f(note, note_size, opaque); --=20 2.14.1.146.gd35faa819