From patchwork Wed Mar 4 16:18:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 45430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B4B31204BC for ; Wed, 4 Mar 2015 16:18:55 +0000 (UTC) Received: by lbdu14 with SMTP id u14sf4396952lbd.3 for ; Wed, 04 Mar 2015 08:18:54 -0800 (PST) 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:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=prp3U7NQWGsAoh3vTahnsNIWXe+WpthCsU69pi7aM7I=; b=RR36D3J7onaVdkLIc13RjRcL7JCq162rKcn+M6N/c+UCfAI2v5yUN/831c8dJV0NPg USdsa8YqK3Om1sPnDHbj9uhxZB/9hzqzxBNirfcFF1tZUU/ecl/Suzt0zt5DzZbHSx0W EMr9mUx2b51cpOl59AvM5vwe4kwjX2BX6VcyNA85hCpqQMFsw0b9ACf8Yuv0ccubA2By D7O/lXHR00+LMdlTjMlxK22JM7bv8vJoSxNFzf43HMmVxatSONI8sxdQWu0vVxF1NpDU UUR/e0VWVJJcmoDCNv9T3MZ7ZOHyB0BWsERBZMBKBm02bpWyzKvI/oxKCJMg2XzXjzt6 jFvQ== X-Gm-Message-State: ALoCoQl8f+7mh81XT8Nw5zFOvemi3JTtVMHgn6PRxPkQtvxQu9R1T3v30cI6wjGqtFBhLDPRO4WD X-Received: by 10.112.147.35 with SMTP id th3mr796592lbb.15.1425485934625; Wed, 04 Mar 2015 08:18:54 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.139 with SMTP id dg11ls208247lac.62.gmail; Wed, 04 Mar 2015 08:18:54 -0800 (PST) X-Received: by 10.112.155.137 with SMTP id vw9mr4222631lbb.70.1425485934485; Wed, 04 Mar 2015 08:18:54 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id y5si2793185lag.88.2015.03.04.08.18.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 08:18:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbiz12 with SMTP id z12so22461834lbi.5 for ; Wed, 04 Mar 2015 08:18:54 -0800 (PST) X-Received: by 10.152.22.67 with SMTP id b3mr3954210laf.117.1425485934402; Wed, 04 Mar 2015 08:18:54 -0800 (PST) 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.35.133 with SMTP id h5csp1318684lbj; Wed, 4 Mar 2015 08:18:53 -0800 (PST) X-Received: by 10.180.106.225 with SMTP id gx1mr57969202wib.53.1425485926449; Wed, 04 Mar 2015 08:18:46 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com. [74.125.82.45]) by mx.google.com with ESMTPS id j8si7622274wjx.185.2015.03.04.08.18.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 08:18:46 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.45 as permitted sender) client-ip=74.125.82.45; Received: by wghn12 with SMTP id n12so7563563wgh.3 for ; Wed, 04 Mar 2015 08:18:46 -0800 (PST) X-Received: by 10.180.8.98 with SMTP id q2mr55841724wia.80.1425485926134; Wed, 04 Mar 2015 08:18:46 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id g5sm6607766wjr.19.2015.03.04.08.18.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Mar 2015 08:18:45 -0800 (PST) From: Eric Auger To: eric.auger@st.com, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: eric.auger@linaro.org, christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, agraf@suse.de, pbonzini@redhat.com, b.reynal@virtualopensystems.com Subject: [PATCH v11 4/4] hw/arm/virt: change indentation in a15memmap Date: Wed, 4 Mar 2015 16:18:29 +0000 Message-Id: <1425485909-5091-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1425485909-5091-1-git-send-email-eric.auger@linaro.org> References: <1425485909-5091-1-git-send-email-eric.auger@linaro.org> 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.217.172 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 --- 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 c3f4c54..e22a0fa 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_GIC_DIST] = { 0x08000000, 0x00010000 }, + [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, + [VIRT_UART] = { 0x09000000, 0x00001000 }, + [VIRT_RTC] = { 0x09010000, 0x00001000 }, + [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, [VIRT_PLATFORM_BUS] = { 0x09400000, 0x00400000 }, - [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, + [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* * 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[] = {