From patchwork Tue Jun 2 11:29:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 49359 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 E9B2A20BD1 for ; Tue, 2 Jun 2015 11:29:56 +0000 (UTC) Received: by lani11 with SMTP id i11sf44555060lan.3 for ; Tue, 02 Jun 2015 04:29:55 -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=k0mjjPMCsS530P+/xAyEwllnoPg7n6CRWSB1p9umBvU=; b=OsRXG+AylJewfKTg9oljGwnj+HrHkxJa5HPVtjjSQgLZyJ/JA9vJvQvkhQ4131HGCo wkZuwKfCqp+xXviG9SQVm1hGYeYPd57viO+eilVdn71LcUxeEn1zn8IxANW8w8+7fkOr 5ummNfKS+EQHldC6/vBE6hdn9Ekq+t1O4wHBDDPKUCZEHGN11DO2dWI+aqjlYqq/WlBh RBQTM7emmlU76yLN7538ITwwEq5+HrvTC3Syq4+TSqUHtLHhcGG4v/F7JuEyo+aXytn+ 70diNwWyLH4nTEbi5pbCwvxTRdmXGbg68Y1mqCfLBT2EI7eSSssgP+Zgtau1O/zl3fBB Ig1A== X-Gm-Message-State: ALoCoQli+8HaFHS0SSwhye/fs2NRRNopgOndX3lM1lWEa7Alc4kuHOb3Voz0UUgF+h5OAaN+55fx X-Received: by 10.180.105.67 with SMTP id gk3mr16044754wib.4.1433244595874; Tue, 02 Jun 2015 04:29:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.162 with SMTP id n2ls781384laf.82.gmail; Tue, 02 Jun 2015 04:29:55 -0700 (PDT) X-Received: by 10.152.5.198 with SMTP id u6mr25318296lau.48.1433244595713; Tue, 02 Jun 2015 04:29:55 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ln2si11522657lac.42.2015.06.02.04.29.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 04:29:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labpy14 with SMTP id py14so111155858lab.0 for ; Tue, 02 Jun 2015 04:29:55 -0700 (PDT) X-Received: by 10.152.4.137 with SMTP id k9mr25301859lak.29.1433244595622; Tue, 02 Jun 2015 04:29:55 -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 hn6csp2990963lbb; Tue, 2 Jun 2015 04:29:55 -0700 (PDT) X-Received: by 10.194.176.225 with SMTP id cl1mr49238025wjc.45.1433244594934; Tue, 02 Jun 2015 04:29:54 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com. [209.85.212.173]) by mx.google.com with ESMTPS id o2si23877322wic.59.2015.06.02.04.29.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 04:29:54 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by wiwd19 with SMTP id d19so15919862wiw.0 for ; Tue, 02 Jun 2015 04:29:54 -0700 (PDT) X-Received: by 10.194.184.14 with SMTP id eq14mr50467893wjc.58.1433244594709; Tue, 02 Jun 2015 04:29:54 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id n6sm21110645wic.16.2015.06.02.04.29.51 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Jun 2015 04:29:51 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: kvmarm@lists.cs.columbia.edu, patches@linaro.org Subject: [PATCH v13 4/4] hw/arm/virt: change indentation in a15memmap Date: Tue, 2 Jun 2015 12:29:14 +0100 Message-Id: <1433244554-12898-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1433244554-12898-1-git-send-email-eric.auger@linaro.org> References: <1433244554-12898-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.45 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 Reviewed-by: Shannon Zhao --- v11 -> v12: - Add Alex R-b --- hw/arm/virt.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 02b91ba..0a75cc8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -111,22 +111,22 @@ 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_GIC_V2M] = { 0x08020000, 0x00001000 }, - [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_GIC_V2M] = { 0x08020000, 0x00001000 }, + [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 }, - [VIRT_PCIE_MMIO] = { 0x10000000, 0x2eff0000 }, - [VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 }, - [VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 }, - [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, + [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, + [VIRT_PCIE_MMIO] = { 0x10000000, 0x2eff0000 }, + [VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 }, + [VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 }, + [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 }, }; static const int a15irqmap[] = {