From patchwork Sat Jun 30 06:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ai1loY1C"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkB54XLyz9s29 for ; Sat, 30 Jun 2018 16:29:01 +1000 (AEST) Received: from localhost ([::1]:45758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9NT-0002ww-8x for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:28:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045q-RO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ963-0001z4-Rq for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:54800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ963-0001xa-Ju for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:59 -0400 Received: by mail-wm0-x243.google.com with SMTP id i139-v6so4085516wmf.4 for ; Fri, 29 Jun 2018 23:10:59 -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=MMd5fYi9h0LYdqJ/n81uzSxU18pw2JNYfoHdsmDiQe0=; b=ai1loY1CpZDC9hISmUTe+Ktz9EFzW1MkWJC3ZWCDSNH2avNfTBrlkdmjh1nWr0kisK byJ9Id7lCk15pFNAxpIamE8RBS234jCDb0NYUNFObdJ3TisTQ4D8wHALxQfka9F49nS1 GTYEuKjaugiko8Hcn7qKBNzcy+qg9ah1McuMMCOPQnElI6jbl417t0HWr43F+kbynjSw fRa6GZzIbOP34c1jYGDQwz7lzjF40qHheC8s4HzxNncW22rCVTgmc1/vssfjGuwhGM3c iqMHyQCICwcDnff0ODl5czN2J5ZdBm1/zOCSze2JkrpAZpXuKsk1PQls+F2fEJrnnldZ 7NYA== 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=MMd5fYi9h0LYdqJ/n81uzSxU18pw2JNYfoHdsmDiQe0=; b=MZqrGFL9SvUcYc4GieYljKLBHqr6IhzKa41lMD9sxCqMT1PPjPCLj/KYsmqwsMpsJB jWwAY/SLRTKohV2b19IBPGH19eOQGdfSs/GBXMaYlV/hG7islpRtzMfUu0X/JTq85TnH XVPye4Zsy0t25sUa/Uqwt+wFJc6F0hZqTuRl3hnKea64Vx9EBmIsFBi1cmRZgqGEzQzx b8khUXAhOaEJWOJRGAleZe2SfQaUlvr0yTKtsbH9Y71qvyYnZTJeY6pbnW0xWK54Hnjd NgbD0mFTlINuuZYgC03zU5KBhwknx2ku91KXg6+UGsM6W5kPiuGwYwMIeKjG+2khNU+9 CUhg== X-Gm-Message-State: APt69E3EMGdBygRe9wwcGLlAx6i86wBdkDvRbYOCmahzTmYVFmUtAe2W myzCyvejv14pIIWg+95BGlauWThC X-Google-Smtp-Source: AAOMgpcpO/8k2gln9upUNzOSRJu/J1lxQd6BchXftVv6ceaUajP7ZU+me6r7bQPSwuz3qsomef/47A== X-Received: by 2002:a1c:5dc9:: with SMTP id r192-v6mr3474061wmb.85.1530339058458; Fri, 29 Jun 2018 23:10:58 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:08 +0200 Message-Id: <20180630061040.6018-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 15/47] hw/block: 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Message-Id: <20180625124238.25339-14-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/block/m25p80.c | 5 +++-- hw/block/nvme.c | 3 ++- hw/block/tc58128.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index b0ed8fa..e8dfa14 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -22,6 +22,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/ssi/ssi.h" @@ -541,12 +542,12 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd) switch (cmd) { case ERASE_4K: case ERASE4_4K: - len = 4 << 10; + len = 4 * KiB; capa_to_assert = ER_4K; break; case ERASE_32K: case ERASE4_32K: - len = 32 << 10; + len = 32 * KiB; capa_to_assert = ER_32K; break; case ERASE_SECTOR: diff --git a/hw/block/nvme.c b/hw/block/nvme.c index d5bf95b..65c84e7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -25,6 +25,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/block/block.h" #include "hw/hw.h" #include "hw/pci/msix.h" @@ -648,7 +649,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c) { - static const int data_len = 4096; + static const int data_len = 4 * KiB; uint32_t min_nsid = le32_to_cpu(c->nsid); uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp2 = le64_to_cpu(c->prp2); diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 1d9f7ee..808ad76 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "hw/loader.h" @@ -26,7 +27,7 @@ typedef struct { static tc58128_dev tc58128_devs[2]; -#define FLASH_SIZE (16*1024*1024) +#define FLASH_SIZE (16 * MiB) static void init_dev(tc58128_dev * dev, const char *filename) {