From patchwork Sat Jun 30 06:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937308 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="oN7zUuyK"; 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 41Hk6y431Zz9s1B for ; Sat, 30 Jun 2018 16:26:18 +1000 (AEST) Received: from localhost ([::1]:45748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Kq-0000lR-5e for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:26:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004JD-0R 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 1fZ96B-0002AZ-QK for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:40592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96B-00029a-I8 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:07 -0400 Received: by mail-wm0-x234.google.com with SMTP id z13-v6so3944778wma.5 for ; Fri, 29 Jun 2018 23:11:07 -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=le/BZsxdCygUXfPv7EM914rRKKDMIEi8+re5JmVzOC0=; b=oN7zUuyK7tVpi9M+38Ujtqti2k7Rz4CbSwKnRyySWz6XnXB+SJ3KgsoxYhJVmdSZws wIQi5wwvSia2EssIwGqASD92stGw48vZToDYi+IzY8x+MsTgaSRKl+sdfAmOhMNHBFuI rtqXh1CQxO5plsOyyv+YJSq268jk3lsb+wFXojq9H4R/nOJS1GTxmUpIPcQe9IfCJ2Tn ruFYAILa4ROKkssiC374kc05TxbnI1PB6+vltWsyJZAxNY9bvege0a+0UNb/CEk5vnlq dHYhUa6i3wFpjEkpVX/axnQn7u1MDmL4uKI4B+p+v+WGv7/8ooOBbiIlGO9YWukismEE BDQg== 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=le/BZsxdCygUXfPv7EM914rRKKDMIEi8+re5JmVzOC0=; b=LcAryTGAcQARMt3W3cOl87zNowerP5fG1tWwCv1zUA/1IvMfmz/UIHkSzcCBGF9C3/ O4s7tN8WTBu8vrVEnjIIs1ZUC0DAR5DDqh8D8VsXN3s0/asVLBEqwU9e77rBL8tOceW5 jRJyFV84ig9pIXZE3+n/QEDmbU478sndAhsQqxWpF4iIpGB2+ajjPKEREOUd8aNsSykj QfZCZThPmEzhnL5vkqbBrHzTbVFQV5xb5FUw/MFkYMadjqUGY4+HUT1oyr38KWtj5rn5 JcfCrwPYeCFuWAp0mCMt/VhszgjQf0PfJmIPxx0du7QdaB/NgOVbAF3sjFopY69PkdRT ABpQ== X-Gm-Message-State: APt69E0RG/KIP+oEfUU/+S87NJfpeDn55srPGXC6FSsLuU5rG3Yjanmh tP+Q1GFurKOCI5VS5cSEtV4eOLxW X-Google-Smtp-Source: AAOMgpfGsIK+lPkPQ5Omxm40svccRJeXnRErFa/Wiue/W0sIRdy/x9Nq25WdJ1Go/yi5nkSml0+KPQ== X-Received: by 2002:a1c:f03:: with SMTP id 3-v6mr3525957wmp.129.1530339066352; Fri, 29 Jun 2018 23:11:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:16 +0200 Message-Id: <20180630061040.6018-24-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::234 Subject: [Qemu-devel] [PULL 23/47] hw/xtensa: 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/ $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Max Filippov Message-Id: <20180625124238.25339-22-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/xtensa/xtfpga.c | 9 +++++---- target/xtensa/helper.c | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 5dc1303..b3161de 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "sysemu/sysemu.h" @@ -152,7 +153,7 @@ static void xtfpga_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram = g_malloc(sizeof(*ram)); - memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16384, + memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16 * KiB, &error_fatal); vmstate_register_ram_global(ram); memory_region_add_subregion(address_space, buffers, ram); @@ -229,7 +230,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); const char *dtb_filename = qemu_opt_get(machine_opts, "dtb"); const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); - const unsigned system_io_size = 224 * 1024 * 1024; + const unsigned system_io_size = 224 * MiB; int n; for (n = 0; n < smp_cpus; n++) { @@ -342,7 +343,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) cpu_physical_memory_write(cur_lowmem, fdt, fdt_size); cur_tagptr = put_tag(cur_tagptr, BP_TAG_FDT, sizeof(dtb_addr), &dtb_addr); - cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4096); + cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB); } #else if (dtb_filename) { @@ -370,7 +371,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) initrd_location.end = tswap32(cur_lowmem + initrd_size); cur_tagptr = put_tag(cur_tagptr, BP_TAG_INITRD, sizeof(initrd_location), &initrd_location); - cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4096); + cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4 * KiB); } cur_tagptr = put_tag(cur_tagptr, BP_TAG_LAST, 0, NULL); env->regs[2] = tagptr; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 34844ee..c9a6132 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" @@ -726,10 +727,10 @@ static void dump_tlb(FILE *f, fprintf_function cpu_fprintf, bool print_header = true; if (sz >= 0x100000) { - sz >>= 20; + sz /= MiB; sz_text = "MB"; } else { - sz >>= 10; + sz /= KiB; sz_text = "KB"; }