From nobody Wed Feb 11 03:25:55 2026 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528681801814801.1644868400442; Sun, 10 Jun 2018 18:50:01 -0700 (PDT) Received: from localhost ([::1]:45891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSBy0-0007GN-5i for importer@patchew.org; Sun, 10 Jun 2018 21:49:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSBSg-0006Dp-88 for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:17:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSBSd-0003fg-JF for qemu-devel@nongnu.org; Sun, 10 Jun 2018 21:17:34 -0400 Received: from mail-qt0-x22a.google.com ([2607:f8b0:400d:c0d::22a]:42494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSBSd-0003fU-Ex; Sun, 10 Jun 2018 21:17:31 -0400 Received: by mail-qt0-x22a.google.com with SMTP id y31-v6so18839433qty.9; Sun, 10 Jun 2018 18:17:31 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id o5-v6sm28237223qtm.60.2018.06.10.18.17.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 18:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hzb3KDk1C+C5bfYzlKadB7KauS83bBN5i2E8WC245YM=; b=QopADyG7UBl5K6eXmh/FwTRyCLI58U0rVjM3LqW6F7Yah0tqjfCElBx5H4Te0l0yjp 93jush20MD4+57xQBd5W/Qnn8tpUpsSa0sGk7/VgjC4Qv5YPSbYdhzXu+PKKPwdmCpFi gqiWqNT88FG2nou6FXozUG+2rdZXLYxWeuKbZo8CB1q2ThriJQC8alhs/WM/R2yIBh38 tTsS5tZ9wJeXNo9OqnkTtNo4cEyQChdTcZOh+dmBn3IVeYSEO9jEo6Qs31oeAIAXElwL pCg10gTd+J5Q2GTRKeVSbNg4Lpk6p+JIOkKYuo8qjjOwXH5uL2dxbCQ6THHDQWaCil4T XMZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Hzb3KDk1C+C5bfYzlKadB7KauS83bBN5i2E8WC245YM=; b=md14cJ02FwoDW8R9CbqPEgLZOneZy8XB2vTwiwM1wLqGc09GPKejDzj1lodqmSdVBU tdFraW7PHyAoLoOrVpwGXEL88jT118pTsxogVIj8jSCja6TJzAF62Xg3QAKgfVrQISJe +ZV0nD4SaT2VUk/G2O/5K4ImcDke8IMGhryepb+imraNbe186Slgbh5Y7CNenvUSmR/Z 4sevCfs+9ocMwwO+mT9roydlpMp/c6SE6AVZZJc61djGkxgjQHeDo3HQwi2UrOkgZvLv UESoArZP6sBs/tDNulaZF/RI/L2S77FMD2fEyecjdQqzyZpHOYHzyU91MOHlW2pWHmfI j9Bw== X-Gm-Message-State: APt69E15b7JDNF9ULkLLhpFQZCoFSHsvlRtARtcxazEc4EV33nMWLxRy UYLGzIIUVoBN/nXJVG44BSM= X-Google-Smtp-Source: ADUXVKLbyrPAoLsJ2Y9pwMzxJQS2PMahrJM6A+yFZtwIQcQ0tvHRcKa/IISi5SLJoMzhwzIiSljcSw== X-Received: by 2002:ac8:2393:: with SMTP id q19-v6mr14227338qtq.197.1528679851043; Sun, 10 Jun 2018 18:17:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Sun, 10 Jun 2018 22:14:57 -0300 Message-Id: <20180611011501.10235-37-f4bug@amsat.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180611011501.10235-1-f4bug@amsat.org> References: <20180611011501.10235-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::22a Subject: [Qemu-devel] [PATCH v4 36/40] hw/sd: Use the IEC binary prefix definitions 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 4 ++-- hw/sd/sdhci.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9a16b768ed..d4356e9b73 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -31,6 +31,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/qdev.h" #include "hw/hw.h" #include "hw/registerfields.h" @@ -38,7 +39,6 @@ #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/bitmap.h" -#include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -403,7 +403,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) ((HWBLOCK_SHIFT << 6) & 0xc0); sd->csd[14] =3D 0x00; /* File format group */ } else { /* SDHC */ - size /=3D 512 * 1024; + size /=3D 512 * KiB; size -=3D 1; sd->csd[0] =3D 0x40; sd->csd[1] =3D 0x0e; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a11e802485..39c2b3a6e8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" @@ -32,7 +33,6 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" -#include "qemu/cutils.h" #include "trace.h" =20 #define TYPE_SDHCI_BUS "sdhci-bus" @@ -790,7 +790,7 @@ static void sdhci_do_adma(SDHCIState *s) return; } =20 - length =3D dscr.length ? dscr.length : 65536; + length =3D dscr.length ? dscr.length : 64 * KiB; =20 switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) { case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */ --=20 2.17.1