From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [PATCH v11 4/4] hw/arm/virt: change indentation in a15memmap Date: Thu, 26 Mar 2015 11:30:00 +0000 Message-ID: <871tkcc7yf.fsf@linaro.org> References: <1425485909-5091-1-git-send-email-eric.auger@linaro.org> <1425485909-5091-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 E871249BC1 for ; Thu, 26 Mar 2015 07:22:30 -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 u1VFwWWBE24I for ; Thu, 26 Mar 2015 07:22:29 -0400 (EDT) Received: from socrates.bennee.com (static.88-198-71-155.clients.your-server.de [88.198.71.155]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id CFDC049BC0 for ; Thu, 26 Mar 2015 07:22:29 -0400 (EDT) In-reply-to: <1425485909-5091-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 Cc: eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu List-Id: kvmarm@lists.cs.columbia.edu CkVyaWMgQXVnZXIgPGVyaWMuYXVnZXJAbGluYXJvLm9yZz4gd3JpdGVzOgoKPiBSZS1pbmRlbnQg aW4gYTE1bWVtbWFwIGFmdGVyIFZJUlRfUExBVEZPUk1fQlVTIGludHJvZHVjdGlvbgo+Cj4gU2ln bmVkLW9mZi1ieTogRXJpYyBBdWdlciA8ZXJpYy5hdWdlckBsaW5hcm8ub3JnPgoKUmV2aWV3ZWQt Ynk6IEFsZXggQmVubsOpZSA8YWxleC5iZW5uZWVAbGluYXJvLm9yZz4KCj4gLS0tCj4gIGh3L2Fy bS92aXJ0LmMgfCAyNiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdl ZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvaHcv YXJtL3ZpcnQuYyBiL2h3L2FybS92aXJ0LmMKPiBpbmRleCBjM2Y0YzU0Li5lMjJhMGZhIDEwMDY0 NAo+IC0tLSBhL2h3L2FybS92aXJ0LmMKPiArKysgYi9ody9hcm0vdmlydC5jCj4gQEAgLTEyOCwy NiArMTI4LDI2IEBAIHR5cGVkZWYgc3RydWN0IHsKPiAgICovCj4gIHN0YXRpYyBjb25zdCBNZW1N YXBFbnRyeSBhMTVtZW1tYXBbXSA9IHsKPiAgICAgIC8qIFNwYWNlIHVwIHRvIDB4ODAwMDAwMCBp cyByZXNlcnZlZCBmb3IgYSBib290IFJPTSAqLwo+IC0gICAgW1ZJUlRfRkxBU0hdID0gICAgICB7 ICAgICAgICAgIDAsIDB4MDgwMDAwMDAgfSwKPiAtICAgIFtWSVJUX0NQVVBFUklQSFNdID0geyAw eDA4MDAwMDAwLCAweDAwMDIwMDAwIH0sCj4gKyAgICBbVklSVF9GTEFTSF0gPSAgICAgICAgICB7 ICAgICAgICAgIDAsIDB4MDgwMDAwMDAgfSwKPiArICAgIFtWSVJUX0NQVVBFUklQSFNdID0gICAg IHsgMHgwODAwMDAwMCwgMHgwMDAyMDAwMCB9LAo+ICAgICAgLyogR0lDIGRpc3RyaWJ1dG9yIGFu ZCBDUFUgaW50ZXJmYWNlcyBzaXQgaW5zaWRlIHRoZSBDUFUgcGVyaXBoZXJhbCBzcGFjZSAqLwo+ IC0gICAgW1ZJUlRfR0lDX0RJU1RdID0gICB7IDB4MDgwMDAwMDAsIDB4MDAwMTAwMDAgfSwKPiAt ICAgIFtWSVJUX0dJQ19DUFVdID0gICAgeyAweDA4MDEwMDAwLCAweDAwMDEwMDAwIH0sCj4gLSAg ICBbVklSVF9VQVJUXSA9ICAgICAgIHsgMHgwOTAwMDAwMCwgMHgwMDAwMTAwMCB9LAo+IC0gICAg W1ZJUlRfUlRDXSA9ICAgICAgICB7IDB4MDkwMTAwMDAsIDB4MDAwMDEwMDAgfSwKPiAtICAgIFtW SVJUX0ZXX0NGR10gPSAgICAgeyAweDA5MDIwMDAwLCAweDAwMDAwMDBhIH0sCj4gKyAgICBbVklS VF9HSUNfRElTVF0gPSAgICAgICB7IDB4MDgwMDAwMDAsIDB4MDAwMTAwMDAgfSwKPiArICAgIFtW SVJUX0dJQ19DUFVdID0gICAgICAgIHsgMHgwODAxMDAwMCwgMHgwMDAxMDAwMCB9LAo+ICsgICAg W1ZJUlRfVUFSVF0gPSAgICAgICAgICAgeyAweDA5MDAwMDAwLCAweDAwMDAxMDAwIH0sCj4gKyAg ICBbVklSVF9SVENdID0gICAgICAgICAgICB7IDB4MDkwMTAwMDAsIDB4MDAwMDEwMDAgfSwKPiAr ICAgIFtWSVJUX0ZXX0NGR10gPSAgICAgICAgIHsgMHgwOTAyMDAwMCwgMHgwMDAwMDAwYSB9LAo+ ICAgICAgW1ZJUlRfUExBVEZPUk1fQlVTXSA9ICAgeyAweDA5NDAwMDAwLCAweDAwNDAwMDAwIH0s Cj4gLSAgICBbVklSVF9NTUlPXSA9ICAgICAgIHsgMHgwYTAwMDAwMCwgMHgwMDAwMDIwMCB9LAo+ ICsgICAgW1ZJUlRfTU1JT10gPSAgICAgICAgICAgeyAweDBhMDAwMDAwLCAweDAwMDAwMjAwIH0s Cj4gICAgICAvKiAuLi5yZXBlYXRpbmcgZm9yIGEgdG90YWwgb2YgTlVNX1ZJUlRJT19UUkFOU1BP UlRTLCBlYWNoIG9mIHRoYXQgc2l6ZSAqLwo+ICAgICAgLyoKPiAgICAgICAqIFBDSUUgdmVyYm9z ZSBtYXA6Cj4gICAgICAgKgo+IC0gICAgICogTU1JTyB3aW5kb3cgICAgICB7IDB4MTAwMDAwMDAs IDB4MmVmZjAwMDAgfSwKPiAtICAgICAqIFBJTyB3aW5kb3cgICAgICAgeyAweDNlZmYwMDAwLCAw eDAwMDEwMDAwIH0sCj4gLSAgICAgKiBFQ0FNICAgICAgICAgICAgIHsgMHgzZjAwMDAwMCwgMHgw MTAwMDAwMCB9LAo+ICsgICAgICogTU1JTyB3aW5kb3cgICAgICAgICAgeyAweDEwMDAwMDAwLCAw eDJlZmYwMDAwIH0sCj4gKyAgICAgKiBQSU8gd2luZG93ICAgICAgICAgICB7IDB4M2VmZjAwMDAs IDB4MDAwMTAwMDAgfSwKPiArICAgICAqIEVDQU0gICAgICAgICAgICAgICAgIHsgMHgzZjAwMDAw MCwgMHgwMTAwMDAwMCB9LAo+ICAgICAgICovCj4gLSAgICBbVklSVF9QQ0lFXSA9ICAgICAgIHsg MHgxMDAwMDAwMCwgMHgzMDAwMDAwMCB9LAo+IC0gICAgW1ZJUlRfTUVNXSA9ICAgICAgICB7IDB4 NDAwMDAwMDAsIDMwVUxMICogMTAyNCAqIDEwMjQgKiAxMDI0IH0sCj4gKyAgICBbVklSVF9QQ0lF XSA9ICAgICAgICAgICB7IDB4MTAwMDAwMDAsIDB4MzAwMDAwMDAgfSwKPiArICAgIFtWSVJUX01F TV0gPSAgICAgICAgICAgIHsgMHg0MDAwMDAwMCwgMzBVTEwgKiAxMDI0ICogMTAyNCAqIDEwMjQg fSwKPiAgfTsKPiAgCj4gIHN0YXRpYyBjb25zdCBpbnQgYTE1aXJxbWFwW10gPSB7CgotLSAKQWxl eCBCZW5uw6llCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cmt2bWFybSBtYWlsaW5nIGxpc3QKa3ZtYXJtQGxpc3RzLmNzLmNvbHVtYmlhLmVkdQpodHRwczov L2xpc3RzLmNzLmNvbHVtYmlhLmVkdS9tYWlsbWFuL2xpc3RpbmZvL2t2bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5yf-0007W9-Mm for qemu-devel@nongnu.org; Thu, 26 Mar 2015 07:29:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb5yc-0000Dg-Sx for qemu-devel@nongnu.org; Thu, 26 Mar 2015 07:29:33 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:59577 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5yc-0000DP-Nm for qemu-devel@nongnu.org; Thu, 26 Mar 2015 07:29:30 -0400 References: <1425485909-5091-1-git-send-email-eric.auger@linaro.org> <1425485909-5091-5-git-send-email-eric.auger@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1425485909-5091-5-git-send-email-eric.auger@linaro.org> Date: Thu, 26 Mar 2015 11:30:00 +0000 Message-ID: <871tkcc7yf.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v11 4/4] hw/arm/virt: change indentation in a15memmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger Cc: peter.maydell@linaro.org, eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu Eric Auger writes: > 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[] = { -- Alex Bennée