From patchwork Wed May 27 08:47:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 49000 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 036DD202A3 for ; Wed, 27 May 2015 08:48:23 +0000 (UTC) Received: by lalw1 with SMTP id w1sf990994lal.0 for ; Wed, 27 May 2015 01:48:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=fvd9cAysI2IcOmGuX8/gCQt9p6ZyeGRM+n0KWLBlWZ4=; b=a9dGDTzILuPGZCjZAOi3AAgCItjh5u/GxR22rRtluiFdlB5FTwwy8CGaMmkx3T8T5Z iYxFT6Y2IuCmPcLqje1BPBzSWe64/OdxBpsvpuztC98a2M5+boTxpfvRLITh6auQY68t YKXZvA8mC3UKMPdr84wIBxhCLW8IRVCr+NFQHhlkv3FWP/1X10CqWJ6FUEC7DyPHqU6U nhxSksTOd/fBQMZXY1fPyXT9xlxLw7JVY5LkqMrooS5l32FZCM9PqOZDdsXVgC+W0Rtg l4JqqdPqw6UAmIrJ2hYnbTyCPbpO6lpYJ0hTj1G6AN7r7bXWk10igu5jt3xmrACwbCNf 6zFg== X-Gm-Message-State: ALoCoQmrKbrOomy7WtGyKB0uw30FqSHZkcNYcDyitRgOUkm5/7Z3fmkdJbsBq0IL436T5gh1SB9I X-Received: by 10.180.106.136 with SMTP id gu8mr27401863wib.6.1432716501996; Wed, 27 May 2015 01:48:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.42 with SMTP id cj10ls14089lad.51.gmail; Wed, 27 May 2015 01:48:21 -0700 (PDT) X-Received: by 10.152.219.3 with SMTP id pk3mr26879777lac.114.1432716501838; Wed, 27 May 2015 01:48:21 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id wo9si13115088lbb.170.2015.05.27.01.48.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 01:48:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagv1 with SMTP id v1so2276211lag.3 for ; Wed, 27 May 2015 01:48:21 -0700 (PDT) X-Received: by 10.152.21.136 with SMTP id v8mr26889001lae.19.1432716501734; Wed, 27 May 2015 01:48:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp191689lbb; Wed, 27 May 2015 01:48:21 -0700 (PDT) X-Received: by 10.180.74.68 with SMTP id r4mr3779149wiv.69.1432716498392; Wed, 27 May 2015 01:48:18 -0700 (PDT) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com. [209.85.212.179]) by mx.google.com with ESMTPS id g13si28368772wjq.175.2015.05.27.01.48.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 01:48:18 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.179 as permitted sender) client-ip=209.85.212.179; Received: by wizk4 with SMTP id k4so103451194wiz.1 for ; Wed, 27 May 2015 01:48:18 -0700 (PDT) X-Received: by 10.194.23.66 with SMTP id k2mr55768214wjf.18.1432716498030; Wed, 27 May 2015 01:48:18 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id g14sm25717288wjs.47.2015.05.27.01.48.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 May 2015 01:48:16 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, agraf@suse.de, pbonzini@redhat.com Subject: [RESEND PATCH v12 4/4] hw/arm/virt: change indentation in a15memmap Date: Wed, 27 May 2015 09:47:50 +0100 Message-Id: <1432716470-2096-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1432716470-2096-1-git-send-email-eric.auger@linaro.org> References: <1432716470-2096-1-git-send-email-eric.auger@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@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.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Re-indent in a15memmap after VIRT_PLATFORM_BUS introduction Signed-off-by: Eric Auger Reviewed-by: Alex Bennée --- v11 -> v12: - Add Alex R-b --- hw/arm/virt.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 199d031..6c1ec58 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -128,26 +128,26 @@ typedef struct { */ static const MemMapEntry a15memmap[] = { /* Space up to 0x8000000 is reserved for a boot ROM */ - [VIRT_FLASH] = { 0, 0x08000000 }, - [VIRT_CPUPERIPHS] = { 0x08000000, 0x00020000 }, + [VIRT_FLASH] = { 0, 0x08000000 }, + [VIRT_CPUPERIPHS] = { 0x08000000, 0x00020000 }, /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */ - [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, - [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, - [VIRT_UART] = { 0x09000000, 0x00001000 }, - [VIRT_RTC] = { 0x09010000, 0x00001000 }, - [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, - [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, + [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, + [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, + [VIRT_UART] = { 0x09000000, 0x00001000 }, + [VIRT_RTC] = { 0x09010000, 0x00001000 }, + [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, + [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, /* * PCIE verbose map: * - * MMIO window { 0x10000000, 0x2eff0000 }, - * PIO window { 0x3eff0000, 0x00010000 }, - * ECAM { 0x3f000000, 0x01000000 }, + * MMIO window { 0x10000000, 0x2eff0000 }, + * PIO window { 0x3eff0000, 0x00010000 }, + * ECAM { 0x3f000000, 0x01000000 }, */ - [VIRT_PCIE] = { 0x10000000, 0x30000000 }, - [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, + [VIRT_PCIE] = { 0x10000000, 0x30000000 }, + [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; static const int a15irqmap[] = {