From patchwork Tue Oct 22 13:31:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177198 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp5801319ocf; Tue, 22 Oct 2019 07:13:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3PB7DeVObqHUmuFtJ7NhlOsOK00CIKkQXTRndpJ76S1ZMqBNcg/xzziK4d+60PgvuLgNf X-Received: by 2002:a37:7b44:: with SMTP id w65mr3136739qkc.409.1571753591379; Tue, 22 Oct 2019 07:13:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571753591; cv=none; d=google.com; s=arc-20160816; b=VxIMGkwJ9nBAMqPfxbt+UE+9ttQY9+EKXfT+opTn0wpiUBsqmCeiqtaw8OM+wcRmCb uR6PaDUy7FLvOC5IkjuFoKG+helXLkQHTHcM9MEM0rwvdw8UBngu6Gs+kv6TNAzg0hjr XTtzAM4ZG/rG0NnqGNr0MAn0ViMaVWhnvVOZzsyisORlhGKE2rpPyF4njPzIxSeHly6Z c2bbfW24U0N0Go0ALT5gT24u4+q2rcDIv5saRS/2jlOWFTOf8haPPwUZwqu0da0BcvPS 95eHo/EG9oZ4E5ka0mndLAS1pMg30B0+lMBs+6uwHBbAjAuBR46wukhNyruACD3Tbm8P AMMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Jd3gjjSWtiLGtLKohxwgc1UFQoof9TDDl8oztxXNFqQ=; b=TtO+w7DAjFLLcWgVhHuMre82DMhnP7tZf1qya5t/NdgkFiMb7VYh1QdH7cwp+o4DIe FERhB3r7NC992DjFS6YhYzlOXVQ/169kmh7734HxI1F4Ei3sjdjNK7GQN0pEi5nz0N8G 1j02NR7/dhoVrolgGYMC9sXYh9V5E0wfLivDQQMCKFmFtf6QZ0sh0uiZQZ/jZyWXFx2x YGMAvssZ7H2efrUDVWadaIcK7X7CVmBCwKIFmINIye94ONMONCgEybaFYr7YTHYflz7q Mjymi2MmtlefDx+5o29XtCw0w4i2HRFEUhqYT6fOercfNJJvKC+kjbns7Sw7TcGJ/sHr RUPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GwZdJvg5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g184si17452161qkf.290.2019.10.22.07.13.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 07:13:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GwZdJvg5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuuM-0002Jt-E0 for patch@linaro.org; Tue, 22 Oct 2019 10:13:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37235) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuHX-0003VL-Tt for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuHW-0001co-D4 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:03 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuHV-0001cZ-Jd for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:33:01 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 6so3708024wmf.0 for ; Tue, 22 Oct 2019 06:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Jd3gjjSWtiLGtLKohxwgc1UFQoof9TDDl8oztxXNFqQ=; b=GwZdJvg5FUQVJs1LfZXvvJwFzBJPINVeTHUqKabr2umrRLjo0Sf4iolcKZSUyevr0M 0SGrwt37ht94rEC9M8AcpnP6lM5JIpJzOFVsMrf3kd/bRu0RQ6kVi+Ecd7cXzcUA5zow j2KHR5BAbzmuHjToVfU1aj7p2YJ7D1zw7v4E8J88pSMYo8KoA7bgCWqtG5B1C6R8rR9K 9uBSdi8IyZCz78CDIq6uSoVaRYOwPxlxBIe3ewyfCyKRr60G2I5BJINDrXL4RpRFRH/b zmt0UHhTs5XE+w3fDE5QgZlfPjvi+cXsPjZVpxD3SAVSeNw0JtRLU1zriey9bh0ypU78 oJmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jd3gjjSWtiLGtLKohxwgc1UFQoof9TDDl8oztxXNFqQ=; b=Mw3SeyFxKCvWE+Hor/rKdDNhLh7/h36HjrHjJzaInOqN1KTg5saTqVc1SO30JcE/I/ V+9C/sNVqtXPnqHyN1jGLBtg0KYI0SFu7S0IBGvCl8vjVGIxATXmy2aLdI7g/Gqt+XAJ dVSAezyukfDTBL6Frm5+9iTf/BNqB8RsMROhOOn1oUQMnWV7iHeajGbT4ZnzZGlMW5Xg mcIsT9qeFL8SJ+UJ16x73KOuzgJtyufF9ItbhRZWZxGZJxKXN2fN+wGo47/QxSjcZqB1 YgDH1J6EwwsqK01n6OqbWiOMxZuKZ+b10c+Jzl8LurB9dN4mSjRL295kCtkHHO198geM ZxEQ== X-Gm-Message-State: APjAAAXULv8/ddHzLiovjAYd9UczKim0ycBX7DWUqd3sLA4L8IWEPFWc rcWPpJXUkNkqOA/JtkQ/7wIr22bs+og= X-Received: by 2002:a1c:7d95:: with SMTP id y143mr3202507wmc.143.1571751179739; Tue, 22 Oct 2019 06:32:59 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 36/41] hw/arm/xilinx_zynq: Use the IEC binary prefix definitions Date: Tue, 22 Oct 2019 14:31:29 +0100 Message-Id: <20191022133134.14487-37-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé IEC binary prefixes ease code review: the unit is explicit. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20191021190653.9511-2-philmd@redhat.com Signed-off-by: Peter Maydell --- hw/arm/xilinx_zynq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index c14774e542c..3a0fa5b23f7 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" @@ -194,7 +195,7 @@ static void zynq_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, ext_ram); /* 256K of on-chip memory */ - memory_region_init_ram(ocm_ram, NULL, "zynq.ocm_ram", 256 << 10, + memory_region_init_ram(ocm_ram, NULL, "zynq.ocm_ram", 256 * KiB, &error_fatal); memory_region_add_subregion(address_space_mem, 0xFFFC0000, ocm_ram);