From patchwork Mon Aug 4 13:53:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 34838 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C3BD321F5F for ; Mon, 4 Aug 2014 13:55:09 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf50597542pac.3 for ; Mon, 04 Aug 2014 06:55:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=32WY/vi75NvqENE9eBIsQI4ncKU5euJO2WqEvlDP8Mo=; b=EXksAYkQ/zDSGcf2PJnzj+UsRyWb837Ed8dLANAQfRZ/x2pkdgMJo8hJSWcaIpCbD5 UooQfI4kgrgu6FOb8tRV9I7DSPPgKoFvqxa8OC+vRHjbz7zXS1wZgZj3czv2616PsEX4 mfkPvLhZgPWXHxu9YL+hw+KPTFJiNZUdSQzjN8YjoCkeP5b97Cm2pwu8jo+JNbo7QU9M aBAZih+f9JsAoBOVJe5pWPX+tO0pDsLDRx0CqGGUlQFRTBs8veNSE7S5BX8sEitRWf2J HcufE5q8lrvLCTjALoggsAz9wAP/gOsRpgAJQC+Kc+14h6twA0i1Vz/RrfrViBsNadRZ n+1w== X-Gm-Message-State: ALoCoQlUTkxpphBovtO+UvmGmjx14ktJSYhpJqtoOVy70AVaf9kXsk6KGY9rClKNBtPAhqL3hiql X-Received: by 10.70.98.164 with SMTP id ej4mr9036307pdb.3.1407160509139; Mon, 04 Aug 2014 06:55:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.239 with SMTP id p102ls2118655qgd.57.gmail; Mon, 04 Aug 2014 06:55:09 -0700 (PDT) X-Received: by 10.220.50.8 with SMTP id x8mr23526159vcf.18.1407160509010; Mon, 04 Aug 2014 06:55:09 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id tf2si11950323vcb.77.2014.08.04.06.55.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:55:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so10984294vcb.0 for ; Mon, 04 Aug 2014 06:55:08 -0700 (PDT) X-Received: by 10.52.3.40 with SMTP id 8mr5663690vdz.24.1407160508936; Mon, 04 Aug 2014 06:55:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp306283vcb; Mon, 4 Aug 2014 06:55:08 -0700 (PDT) X-Received: by 10.229.242.65 with SMTP id lh1mr36792724qcb.18.1407160508168; Mon, 04 Aug 2014 06:55:08 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u10si6478576qcc.6.2014.08.04.06.55.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:55:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIjD-0006Hm-Py for patch@linaro.org; Mon, 04 Aug 2014 09:55:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIi9-00054U-Ev for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEIi6-0007IU-Rh for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:01 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIi6-0006mN-Ju for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:53:58 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XEIhd-0001Ae-0K for qemu-devel@nongnu.org; Mon, 04 Aug 2014 14:53:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 14:53:18 +0100 Message-Id: <1407160408-4467-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> References: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 02/12] hw/arm/virt: formatting: memory map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Andrew Jones Add some spacing and zeros to make it easier to read and modify the map. This patch has no functional changes. The review looks ugly, but it's actually pretty easy to confirm all the addresses are as they should be - thanks to the new formatting ;-) Signed-off-by: Andrew Jones Signed-off-by: Peter Maydell --- hw/arm/virt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 89532bd..ba94298 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -98,17 +98,17 @@ typedef struct VirtBoardInfo { */ static const MemMapEntry a15memmap[] = { /* Space up to 0x8000000 is reserved for a boot ROM */ - [VIRT_FLASH] = { 0, 0x8000000 }, - [VIRT_CPUPERIPHS] = { 0x8000000, 0x20000 }, + [VIRT_FLASH] = { 0, 0x08000000 }, + [VIRT_CPUPERIPHS] = { 0x08000000, 0x00020000 }, /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */ - [VIRT_GIC_DIST] = { 0x8000000, 0x10000 }, - [VIRT_GIC_CPU] = { 0x8010000, 0x10000 }, - [VIRT_UART] = { 0x9000000, 0x1000 }, - [VIRT_RTC] = { 0x9010000, 0x1000 }, - [VIRT_MMIO] = { 0xa000000, 0x200 }, + [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, + [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, + [VIRT_UART] = { 0x09000000, 0x00001000 }, + [VIRT_RTC] = { 0x09010000, 0x00001000 }, + [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */ - [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, + [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; static const int a15irqmap[] = {