From nobody Tue Nov 4 18:44:28 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530340434076963.4838122330561; Fri, 29 Jun 2018 23:33:54 -0700 (PDT) Received: from localhost ([::1]:45782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9SD-0007DS-9m for importer@patchew.org; Sat, 30 Jun 2018 02:33:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004K2-Lh for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96E-0002GA-HG for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:11 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:36492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96E-0002EG-9L for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: by mail-wm0-x22d.google.com with SMTP id u18-v6so3959490wmc.1 for ; Fri, 29 Jun 2018 23:11:10 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:08 -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=IoGQAKu8p9jneTKieD7S589NvaS6f8CPtBeAo2ZoIwk=; b=AmM2PB8g+4fFYaF3gB1QMnXyIs48wZWu5iVIQEPCQjp0mV1sU/Uk01Dnw9BXwpWGHJ K7ICHeovsfRruWaEEsMUoHxtT4hhMCgv5Ql24nwGMTqA75wY/OxmQ0baWlY4FP9AOxAC qYw6Cw2y44AjqyovCqUWkcWWCHTn5TCX5dnKAy7UEttGTB+gnxvMXCrHr5LF5BqlWiRl 5d6pUGkV9UU8m9DuIiJi8a1o/RsvZ1Re2jmPFITA6ZCQKV7jw6uzGmLFPbl/0m0eJvq9 MzjFlJfXouqNqCXiDaisTVs50OD9NK40o1qvEs0eo/fQbAFgpandFfIM7aUZa17NF3l0 qLrA== 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=IoGQAKu8p9jneTKieD7S589NvaS6f8CPtBeAo2ZoIwk=; b=ZJA4agxZGLoXTDSf18VTyot5w984AqLIBGfOXqrm9EVEUPdnmaSquarw1KuqFkB/D8 +vQQOXpCLLlE98NuKxlHdDrKk1kTVPlYJN//NdWBqI7hXjDRotWD5Zz+R8JQcETkPpM7 QTRVyR29ZD9AhLZGotRNrnkU3Ba9efWbxG5n7d1oxdKufjLlah5pEmK307HK8cYq9Rer jTOwmh4vB4PLIAkGG9OMx37X2lMw+iOrVAWlZCFa1pyikNL7JB5TURNWov353+7hwVOZ v/IGuQhIP2kL2Pi1Gv25Sc0vMih/MP+IH7ghcnx42fOw24tJxTdNhbw5aYJGnKzlJaek t+EA== X-Gm-Message-State: APt69E1Xg1F3tiuvJvDFgCQIjNorXkoge3PeRKwTuuybo/w0MfoNEpFu hxQL5DzACoIeMfCFq/UkeCRn1u2X X-Google-Smtp-Source: AAOMgpfgpv/gDcgM3AtegYOOgZcx6fliFRFUXiEsKFxk0u4AiafLKGkZ1Id6cdbA1x1DXpXJKTMZcQ== X-Received: by 2002:a1c:a484:: with SMTP id n126-v6mr3727412wme.140.1530339069157; Fri, 29 Jun 2018 23:11:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:19 +0200 Message-Id: <20180630061040.6018-27-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 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: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 26/47] hw/microblaze: 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=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20180625124238.25339-25-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 6c4a544..c730878 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -26,6 +26,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -44,8 +45,8 @@ =20 #include "hw/stream.h" =20 -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (32 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * KiB) +#define FLASH_SIZE (32 * MiB) =20 #define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb" =20 @@ -109,7 +110,7 @@ petalogix_ml605_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_ml605.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * KiB, FLASH_SIZE >> 16, 2, 0x89, 0x18, 0x0000, 0x0, 0); =20 =20 diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petal= ogix_s3adsp1800_mmu.c index 0da3e62..5cf7b84 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -39,8 +40,8 @@ =20 #include "boot.h" =20 -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (16 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * KiB) +#define FLASH_SIZE (16 * MiB) =20 #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb" =20 @@ -87,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_s3adsp1800.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * KiB, FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); =20 dev =3D qdev_create(NULL, "xlnx.xps-intc"); --=20 1.8.3.1