From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFPBP-00049j-0h for qemu-devel@nongnu.org; Tue, 21 Jun 2016 13:09:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFPBM-00047c-VC for qemu-devel@nongnu.org; Tue, 21 Jun 2016 13:09:49 -0400 From: Peter Maydell Date: Tue, 21 Jun 2016 18:09:30 +0100 Message-Id: <1466528974-12183-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1466528974-12183-1-git-send-email-peter.maydell@linaro.org> References: <1466528974-12183-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 2/6] exec.c: Remove static allocation of sub_section of sub_page List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Vijaya Kumar K , Paolo Bonzini From: Vijaya Kumar K Allocate sub_section dynamically. Remove dependency on TARGET_PAGE_SIZE to make run-time page size detection for arm platforms. Signed-off-by: Vijaya Kumar K Message-id: 1465808915-4887-3-git-send-email-vijayak@caviumnetworks.com [PMM: use flexible array member rather than separate malloc so we don't need an extra pointer deref when using it] Signed-off-by: Peter Maydell --- exec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index 0122ef7..8eaeb0c 100644 --- a/exec.c +++ b/exec.c @@ -153,7 +153,7 @@ typedef struct subpage_t { MemoryRegion iomem; AddressSpace *as; hwaddr base; - uint16_t sub_section[TARGET_PAGE_SIZE]; + uint16_t sub_section[]; } subpage_t; #define PHYS_SECTION_UNASSIGNED 0 @@ -2270,8 +2270,7 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base) { subpage_t *mmio; - mmio = g_malloc0(sizeof(subpage_t)); - + mmio = g_malloc0(sizeof(subpage_t) + TARGET_PAGE_SIZE * sizeof(uint16_t)); mmio->as = as; mmio->base = base; memory_region_init_io(&mmio->iomem, NULL, &subpage_ops, mmio, -- 1.9.1