From nobody Mon Feb 9 04:39:01 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529932030779204.56244719599124; Mon, 25 Jun 2018 06:07:10 -0700 (PDT) Received: from localhost ([::1]:46775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXRD3-0003Wy-Tx for importer@patchew.org; Mon, 25 Jun 2018 09:07:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXQqw-0001uS-Ho for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXQqv-00080d-N8 for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:18 -0400 Received: from mail-qk0-x22f.google.com ([2607:f8b0:400d:c09::22f]:36333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fXQqv-00080P-IM; Mon, 25 Jun 2018 08:44:17 -0400 Received: by mail-qk0-x22f.google.com with SMTP id a132-v6so423283qkg.3; Mon, 25 Jun 2018 05:44:17 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id m15-v6sm12549562qtm.84.2018.06.25.05.44.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 05:44:16 -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=wplSpMQsybUjD/teSFBT4ppWSdPGswCxgwbKvL+lxAs=; b=RLW8TNsBODFQpWTlNTWe5H6jUMikFf6/Mo5JDJwzxEMpf7NWyn75CCUm3gjN5Xz7i6 ezBwn1iRG6D1tYO7I86uJwh4CKa3KxOuwSkXWWwwZAz/6iWwdjHoFvH7OF1+CrbyUnBI MvqZ3ltevSqICOZCFNM+VyunqHBS4XkuPHKY/2Xj7OaL8ZD0lieQ7Br8eiy25eW9+Tw9 bCEduK95urXaLsW4hk+BFtw0oOuGa84Mj5ggZiFa9/9wuV4UlhNPmXHj113s8cBCnzoa qjDrDAweSWrGPHsW3/7uJi9mq8ypvl2wMhGFYDjIICK6896A8JcsAdl6dJkRKrtsSyvt FF0A== 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=wplSpMQsybUjD/teSFBT4ppWSdPGswCxgwbKvL+lxAs=; b=ZLGo4S72UWm032kLQ8yYfcl7A+5/3EvjSloLHlJlBJnk392r+SXhy+fR+Oav60TtFU 0i2/aaYKu9b40vMOvj6yPsF/NRBKRaMbjzf11wRx4eIwVw9TODrqLSBp5ICir1JRsGza x2eHj0rSUQ1RL4JsYfZ6ASEWlkNNz3i80bqQek3VsxsiNwyMX4x09ccPhb4l0ksI34Gp 98so7ky5XeCFFVUb5ObTWUmeiA7V7fxO5TMdDyWN7TQEjjsfsa9KBwkNsfHvAoGkXo9+ 1SHOgKzRFnB4r5Cd8tv+nnt9znXo1d6SscnP0p4ihRnn5YBRaJOvv5M6CN3SaeHFJca3 WHRw== X-Gm-Message-State: APt69E3mlnKUygq5MSjIrSmPTl03c+1Xqp/Xdlp90KxqETC8tGZWFs3g EZTQLsTOEb8h3YVd7u1lMYo= X-Google-Smtp-Source: AAOMgpcsdhvi9eW2WzxOA5dfXFtON0IRDLrDQ/n5/MHOjDz9Hp80UHeNniG8JeHhB25gWcLGC9eHVA== X-Received: by 2002:a37:234c:: with SMTP id j73-v6mr4197623qkj.146.1529930656976; Mon, 25 Jun 2018 05:44:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Mon, 25 Jun 2018 09:42:16 -0300 Message-Id: <20180625124238.25339-25-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625124238.25339-1-f4bug@amsat.org> References: <20180625124238.25339-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:c09::22f Subject: [Qemu-devel] [PATCH v5 24/46] 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: qemu-trivial@nongnu.org, "Edgar E. Iglesias" , =?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 Reviewed-by: Richard Henderson --- 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 6c4a544eac..c730878d25 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 0da3e62102..5cf7b84c79 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 2.18.0