From patchwork Tue Jul 29 16:46:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 34489 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DDCA120DCC for ; Tue, 29 Jul 2014 16:47:31 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf58228842pdb.1 for ; Tue, 29 Jul 2014 09:47:31 -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:cc: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=CVmigoAf5rKKz1j8bdFVmBM/hUDwBu6p6Sg3iOD7Kzc=; b=dUwUa9Q+GT8Og/wUcwqHThvyizQgGD/fXJTwayC0LZuQ1UCAh0p/Tjt7lNcvJ6d5Oe Us6Ym879wMpM5OXpUVH803xhqx7yRJI5zfmjhxKSSVJQo/VMAGqUL7fchI3WWMpfz5Rh iiwxjcACbdvykkdeGQzCpI6GqWrfOoaaaBACux9B1WqP1zkHgKWtm2cs2uV0qx7EJAtp 94Efqfbh67xJkJi+ySN3moMK3XYSD+SvZNRgF/k/5sz0Kt4Hu7TNchoNnOegZsK5Sfly 2cw+UaT4nen35vgrsFfFBTQVTFu2PZZq3C7teMYBCU8ZAFPl9RWFYsvTUi7lz0SCHQYs oN8Q== X-Gm-Message-State: ALoCoQlxbO/vko9F1n9WdntZSsWWIHmXERCYD7gEk05m9fb291lhWqhq2vgbosE/ELYItW3ypCB9 X-Received: by 10.66.65.108 with SMTP id w12mr1121806pas.46.1406652451144; Tue, 29 Jul 2014 09:47:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.193 with SMTP id q59ls192440qga.91.gmail; Tue, 29 Jul 2014 09:47:30 -0700 (PDT) X-Received: by 10.220.7.71 with SMTP id c7mr2103329vcc.77.1406652450922; Tue, 29 Jul 2014 09:47:30 -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 kf20si4818556vdb.24.2014.07.29.09.47.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jul 2014 09:47:30 -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 le20so5233328vcb.0 for ; Tue, 29 Jul 2014 09:47:30 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr2596599vdb.27.1406652450832; Tue, 29 Jul 2014 09:47:30 -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 tc5csp258510vcb; Tue, 29 Jul 2014 09:47:30 -0700 (PDT) X-Received: by 10.224.151.79 with SMTP id b15mr5600978qaw.42.1406652450246; Tue, 29 Jul 2014 09:47:30 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id gm9si4117660qcb.49.2014.07.29.09.47.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 29 Jul 2014 09:47:30 -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]:47089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAYj-0001iz-Vd for patch@linaro.org; Tue, 29 Jul 2014 12:47:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAY8-0001A5-00 for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:46:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCAY0-0008RJ-H1 for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:46:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAY0-0008RF-9k for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:46:44 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6TGkavE023331 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Jul 2014 12:46:36 -0400 Received: from hawk.usersys.redhat.com (dhcp-1-116.brq.redhat.com [10.34.1.116]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TGkYu6017516; Tue, 29 Jul 2014 12:46:35 -0400 From: Andrew Jones To: qemu-devel@nongnu.org Date: Tue, 29 Jul 2014 18:46:30 +0200 Message-Id: <1406652390-10281-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH] 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: drjones@redhat.com 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 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 ;-) Applies on top of 'v2.1.0-rc5'. Signed-off-by: Andrew Jones --- 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 89532bd786436..ba94298555506 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[] = {