From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shannon Zhao Subject: Re: [Qemu-devel] [PATCH v13 4/4] hw/arm/virt: change indentation in a15memmap Date: Tue, 02 Jun 2015 19:48:34 +0800 Message-ID: <556D9812.3040003@linaro.org> References: <1433244554-12898-1-git-send-email-eric.auger@linaro.org> <1433244554-12898-5-git-send-email-eric.auger@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 6C30F52C9E for ; Tue, 2 Jun 2015 07:38:50 -0400 (EDT) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fe+BYXeKjflp for ; Tue, 2 Jun 2015 07:38:49 -0400 (EDT) Received: from mail-ob0-f173.google.com (mail-ob0-f173.google.com [209.85.214.173]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 4900F52C9B for ; Tue, 2 Jun 2015 07:38:48 -0400 (EDT) Received: by obew15 with SMTP id w15so125963114obe.1 for ; Tue, 02 Jun 2015 04:48:47 -0700 (PDT) In-Reply-To: <1433244554-12898-5-git-send-email-eric.auger@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Eric Auger , eric.auger@st.com, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: kvmarm@lists.cs.columbia.edu, patches@linaro.org List-Id: kvmarm@lists.cs.columbia.edu CgpPbiAyMDE1LzYvMiAxOToyOSwgRXJpYyBBdWdlciB3cm90ZToKPiBSZS1pbmRlbnQgaW4gYTE1 bWVtbWFwIGFmdGVyIFZJUlRfUExBVEZPUk1fQlVTIGludHJvZHVjdGlvbgo+IAo+IFNpZ25lZC1v ZmYtYnk6IEVyaWMgQXVnZXIgPGVyaWMuYXVnZXJAbGluYXJvLm9yZz4KPiBSZXZpZXdlZC1ieTog QWxleCBCZW5uw6llIDxhbGV4LmJlbm5lZUBsaW5hcm8ub3JnPgo+IApSZXZpZXdlZC1ieTogU2hh bm5vbiBaaGFvIDxzaGFubm9uLnpoYW9AbGluYXJvLm9yZz4KCj4gLS0tCj4gCj4gdjExIC0+IHYx MjoKPiAtIEFkZCBBbGV4IFItYgo+IC0tLQo+ICBody9hcm0vdmlydC5jIHwgMjggKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwg MTQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2h3L2FybS92aXJ0LmMgYi9ody9hcm0v dmlydC5jCj4gaW5kZXggMDJiOTFiYS4uMGE3NWNjOCAxMDA2NDQKPiAtLS0gYS9ody9hcm0vdmly dC5jCj4gKysrIGIvaHcvYXJtL3ZpcnQuYwo+IEBAIC0xMTEsMjIgKzExMSwyMiBAQCB0eXBlZGVm IHN0cnVjdCB7Cj4gICAqLwo+ICBzdGF0aWMgY29uc3QgTWVtTWFwRW50cnkgYTE1bWVtbWFwW10g PSB7Cj4gICAgICAvKiBTcGFjZSB1cCB0byAweDgwMDAwMDAgaXMgcmVzZXJ2ZWQgZm9yIGEgYm9v dCBST00gKi8KPiAtICAgIFtWSVJUX0ZMQVNIXSA9ICAgICAgeyAgICAgICAgICAwLCAweDA4MDAw MDAwIH0sCj4gLSAgICBbVklSVF9DUFVQRVJJUEhTXSA9IHsgMHgwODAwMDAwMCwgMHgwMDAyMDAw MCB9LAo+ICsgICAgW1ZJUlRfRkxBU0hdID0gICAgICAgICAgICAgIHsgICAgICAgICAgMCwgMHgw ODAwMDAwMCB9LAo+ICsgICAgW1ZJUlRfQ1BVUEVSSVBIU10gPSAgICAgICAgIHsgMHgwODAwMDAw MCwgMHgwMDAyMDAwMCB9LAo+ICAgICAgLyogR0lDIGRpc3RyaWJ1dG9yIGFuZCBDUFUgaW50ZXJm YWNlcyBzaXQgaW5zaWRlIHRoZSBDUFUgcGVyaXBoZXJhbCBzcGFjZSAqLwo+IC0gICAgW1ZJUlRf R0lDX0RJU1RdID0gICB7IDB4MDgwMDAwMDAsIDB4MDAwMTAwMDAgfSwKPiAtICAgIFtWSVJUX0dJ Q19DUFVdID0gICAgeyAweDA4MDEwMDAwLCAweDAwMDEwMDAwIH0sCj4gLSAgICBbVklSVF9HSUNf VjJNXSA9ICAgIHsgMHgwODAyMDAwMCwgMHgwMDAwMTAwMCB9LAo+IC0gICAgW1ZJUlRfVUFSVF0g PSAgICAgICB7IDB4MDkwMDAwMDAsIDB4MDAwMDEwMDAgfSwKPiAtICAgIFtWSVJUX1JUQ10gPSAg ICAgICAgeyAweDA5MDEwMDAwLCAweDAwMDAxMDAwIH0sCj4gLSAgICBbVklSVF9GV19DRkddID0g ICAgIHsgMHgwOTAyMDAwMCwgMHgwMDAwMDAwYSB9LAo+IC0gICAgW1ZJUlRfTU1JT10gPSAgICAg ICB7IDB4MGEwMDAwMDAsIDB4MDAwMDAyMDAgfSwKPiArICAgIFtWSVJUX0dJQ19ESVNUXSA9ICAg ICAgICAgICB7IDB4MDgwMDAwMDAsIDB4MDAwMTAwMDAgfSwKPiArICAgIFtWSVJUX0dJQ19DUFVd ID0gICAgICAgICAgICB7IDB4MDgwMTAwMDAsIDB4MDAwMTAwMDAgfSwKPiArICAgIFtWSVJUX0dJ Q19WMk1dID0gICAgICAgICAgICB7IDB4MDgwMjAwMDAsIDB4MDAwMDEwMDAgfSwKPiArICAgIFtW SVJUX1VBUlRdID0gICAgICAgICAgICAgICB7IDB4MDkwMDAwMDAsIDB4MDAwMDEwMDAgfSwKPiAr ICAgIFtWSVJUX1JUQ10gPSAgICAgICAgICAgICAgICB7IDB4MDkwMTAwMDAsIDB4MDAwMDEwMDAg fSwKPiArICAgIFtWSVJUX0ZXX0NGR10gPSAgICAgICAgICAgICB7IDB4MDkwMjAwMDAsIDB4MDAw MDAwMGEgfSwKPiArICAgIFtWSVJUX01NSU9dID0gICAgICAgICAgICAgICB7IDB4MGEwMDAwMDAs IDB4MDAwMDAyMDAgfSwKPiAgICAgIC8qIC4uLnJlcGVhdGluZyBmb3IgYSB0b3RhbCBvZiBOVU1f VklSVElPX1RSQU5TUE9SVFMsIGVhY2ggb2YgdGhhdCBzaXplICovCj4gLSAgICBbVklSVF9QTEFU Rk9STV9CVVNdID0gICB7IDB4MGMwMDAwMDAsIDB4MDIwMDAwMDAgfSwKPiAtICAgIFtWSVJUX1BD SUVfTU1JT10gPSAgeyAweDEwMDAwMDAwLCAweDJlZmYwMDAwIH0sCj4gLSAgICBbVklSVF9QQ0lF X1BJT10gPSAgIHsgMHgzZWZmMDAwMCwgMHgwMDAxMDAwMCB9LAo+IC0gICAgW1ZJUlRfUENJRV9F Q0FNXSA9ICB7IDB4M2YwMDAwMDAsIDB4MDEwMDAwMDAgfSwKPiAtICAgIFtWSVJUX01FTV0gPSAg ICAgICAgeyAweDQwMDAwMDAwLCAzMFVMTCAqIDEwMjQgKiAxMDI0ICogMTAyNCB9LAo+ICsgICAg W1ZJUlRfUExBVEZPUk1fQlVTXSA9ICAgICAgIHsgMHgwYzAwMDAwMCwgMHgwMjAwMDAwMCB9LAo+ ICsgICAgW1ZJUlRfUENJRV9NTUlPXSA9ICAgICAgICAgIHsgMHgxMDAwMDAwMCwgMHgyZWZmMDAw MCB9LAo+ICsgICAgW1ZJUlRfUENJRV9QSU9dID0gICAgICAgICAgIHsgMHgzZWZmMDAwMCwgMHgw MDAxMDAwMCB9LAo+ICsgICAgW1ZJUlRfUENJRV9FQ0FNXSA9ICAgICAgICAgIHsgMHgzZjAwMDAw MCwgMHgwMTAwMDAwMCB9LAo+ICsgICAgW1ZJUlRfTUVNXSA9ICAgICAgICAgICAgICAgIHsgMHg0 MDAwMDAwMCwgMzBVTEwgKiAxMDI0ICogMTAyNCAqIDEwMjQgfSwKPiAgfTsKPiAgCj4gIHN0YXRp YyBjb25zdCBpbnQgYTE1aXJxbWFwW10gPSB7Cj4gCgotLSAKU2hhbm5vbgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwprdm1hcm0gbWFpbGluZyBsaXN0Cmt2 bWFybUBsaXN0cy5jcy5jb2x1bWJpYS5lZHUKaHR0cHM6Ly9saXN0cy5jcy5jb2x1bWJpYS5lZHUv bWFpbG1hbi9saXN0aW5mby9rdm1hcm0K From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzkgf-0007TX-R5 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:48:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzkga-0005sA-T4 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:48:53 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:36542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzkga-0005ru-OC for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:48:48 -0400 Received: by obbea2 with SMTP id ea2so125474617obb.3 for ; Tue, 02 Jun 2015 04:48:47 -0700 (PDT) Message-ID: <556D9812.3040003@linaro.org> Date: Tue, 02 Jun 2015 19:48:34 +0800 From: Shannon Zhao MIME-Version: 1.0 References: <1433244554-12898-1-git-send-email-eric.auger@linaro.org> <1433244554-12898-5-git-send-email-eric.auger@linaro.org> In-Reply-To: <1433244554-12898-5-git-send-email-eric.auger@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v13 4/4] hw/arm/virt: change indentation in a15memmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger , eric.auger@st.com, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: kvmarm@lists.cs.columbia.edu, patches@linaro.org On 2015/6/2 19:29, Eric Auger wrote: > 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[] = { > -- Shannon