From nobody Wed Nov 5 13:34:48 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.zoho.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 1498135800950617.8360565657217; Thu, 22 Jun 2017 05:50:00 -0700 (PDT) Received: from localhost ([::1]:58834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO1Yc-0004HW-KW for importer@patchew.org; Thu, 22 Jun 2017 08:49:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO1Rr-0006ZW-Uw for qemu-devel@nongnu.org; Thu, 22 Jun 2017 08:43:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO1Rr-00063r-2v for qemu-devel@nongnu.org; Thu, 22 Jun 2017 08:43:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60008) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dO1Ro-0005yX-OF; Thu, 22 Jun 2017 08:42:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A979C14288F; Thu, 22 Jun 2017 12:42:55 +0000 (UTC) Received: from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9C6E6061B; Thu, 22 Jun 2017 12:42:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A979C14288F Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=marcandre.lureau@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A979C14288F From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 22 Jun 2017 14:41:42 +0200 Message-Id: <20170622124204.19407-10-marcandre.lureau@redhat.com> In-Reply-To: <20170622124204.19407-1-marcandre.lureau@redhat.com> References: <20170622124204.19407-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 22 Jun 2017 12:42:55 +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] [PATCH 09/31] vpc: use DIV_ROUND_UP 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: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "open list:vpc" , Max Reitz 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 to generate the fix: https://github.com/elmarco/clang-tools-extra Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/vpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 4240ba9d1c..f52a7c0f0f 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -760,7 +760,7 @@ static int calculate_geometry(int64_t total_sectors, ui= nt16_t* cyls, } else { *secs_per_cyl =3D 17; cyls_times_heads =3D total_sectors / *secs_per_cyl; - *heads =3D (cyls_times_heads + 1023) / 1024; + *heads =3D DIV_ROUND_UP(cyls_times_heads, 1024); =20 if (*heads < 4) { *heads =3D 4; @@ -813,7 +813,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8= _t *buf, offset =3D 3 * 512; =20 memset(buf, 0xFF, 512); - for (i =3D 0; i < (num_bat_entries * 4 + 511) / 512; i++) { + for (i =3D 0; i < DIV_ROUND_UP(num_bat_entries * 4, 512); i++) { ret =3D blk_pwrite(blk, offset, buf, 512, 0); if (ret < 0) { goto fail; --=20 2.13.1.395.gf7b71de06