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: Eric Auger X-Patchwork-Id: 477000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A40611406AA for ; Wed, 27 May 2015 18:51:35 +1000 (AEST) Received: from localhost ([::1]:52587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxX3l-0004RA-Tw for incoming@patchwork.ozlabs.org; Wed, 27 May 2015 04:51:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxX0g-00006K-34 for qemu-devel@nongnu.org; Wed, 27 May 2015 04:48:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxX0c-0007xH-U1 for qemu-devel@nongnu.org; Wed, 27 May 2015 04:48:22 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:34233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxX0c-0007xC-Nj for qemu-devel@nongnu.org; Wed, 27 May 2015 04:48:18 -0400 Received: by wgv5 with SMTP id 5so3168913wgv.1 for ; Wed, 27 May 2015 01:48:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=fvd9cAysI2IcOmGuX8/gCQt9p6ZyeGRM+n0KWLBlWZ4=; b=fIRcsHpy/Oh/NFPSiNyYi89RN+THZVgLQriX/w2dfKWsL0Npxp3agM6VI0PSRdHuxq sLDwpb2IUSAUokAat3CR/5GRgECIhO/W0hwx16gFfumISQ9+aexPbf5Fo1sOxPqZUPn+ BmUzhcp6ieK6yibRAUWqbCAX9A1jbgoxUMGKHwu+JWAX3lWT28DfnWG8fjKQQfsaqx4K AuroRk6/02lF9dxXUUc9Ac6jaN+/cNQ6xER0SYJo+YJ7Z4Zp6HQsrnXS+Laegztq1T5m z/EmK4m+V8xjoxDgLt1hpgem0BtlQCxI2zjDlxFKrilFMNGoH1R9so9F1okbVP89Et+E 0bPQ== X-Gm-Message-State: ALoCoQnDS2FjPfEGhhaBxDsNGcqYlP9+q0uMqqZqUL6JksAHI2HLgPuKoJF9cuW+jxwnvq8n9Yvb 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 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.48 Cc: patches@linaro.org, agraf@suse.de, alex.williamson@redhat.com, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org Subject: [Qemu-devel] [RESEND PATCH v12 4/4] hw/arm/virt: change indentation in a15memmap 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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[] = {