From patchwork Tue Mar 24 22:09:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Dirk_M=C3=BCller?= X-Patchwork-Id: 454071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A84B01400DD for ; Wed, 25 Mar 2015 09:10:19 +1100 (AEDT) Received: from localhost ([::1]:34755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaX1c-0000zz-2r for incoming@patchwork.ozlabs.org; Tue, 24 Mar 2015 18:10:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaX1K-0000em-Uv for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:09:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaX1G-0008PS-0T for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:09:58 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:36365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaX1F-0008O3-QT for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:09:53 -0400 Received: by wibg7 with SMTP id g7so87131099wib.1 for ; Tue, 24 Mar 2015 15:09:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ROdV9KM3aEXLcrGAhHe7zt32IvFwwTnPPEpRWeeC+Hw=; b=c4bvYI4dK0VBrxx7zK7SaJQt9q51B/yOcKvNQ3flmj+FK1wn9D/ZvICUAAvpkJsyJw 2sQOV0R9WrtwD2ODDdD5008GKT4qHvpuAd4CZDzmgQfDNqKTdjjiBB2ah3BldhvG2htK hHd7KSSCyylmkFjhuO+t4JdsHwEsmyTrrKeu6lSP9a/AfrRGf/aJy1E4jqPyyEBtn6UJ TnpwP7uTsVlSZaijRwChhH708Dphx6N+THa2ZVEDjF6bYRoK3/oOcvHCzJTLm+UWDxu+ +viP5sd2kU2WBJ8/zfHcRb2NkkyOn4G5JM6VqQogJkIZm+OJo1h/qlA5kciUav9x/vJv D/+g== X-Gm-Message-State: ALoCoQlk7mluKAcd7ZAnS3Xp8I4/Pyl497Yt2yK5JFgJlyOD2TeGNSfs9gU9Qwcfh2xe88fWvKpH MIME-Version: 1.0 X-Received: by 10.180.74.47 with SMTP id q15mr31790492wiv.90.1427234993059; Tue, 24 Mar 2015 15:09:53 -0700 (PDT) Received: by 10.27.81.78 with HTTP; Tue, 24 Mar 2015 15:09:53 -0700 (PDT) In-Reply-To: <5511D72B.8080806@redhat.com> References: <5511D72B.8080806@redhat.com> Date: Tue, 24 Mar 2015 23:09:53 +0100 Message-ID: From: =?UTF-8?B?RGlyayBNw7xsbGVy?= To: Paolo Bonzini X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.176 Cc: Peter Maydell , qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH for-2.3] arm: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory 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 Hi Paolo, > You cannot call memory_region_allocate_system_memory twice. For cases > like this one, the right thing to do is to create a region with > memory_region_allocate_system_memory, and then replace > memory_region_init_ram with memory_region_init_alias. This "slices" the > region created by memory_region_allocate_system_memory. Thanks for the review and the explanation. Like this? --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -144,6 +144,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, DeviceState *dev; SysBusDevice *busdev; ObjectClass *cpu_oc; + MemoryRegion *ram_all = g_new(MemoryRegion, 1); cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9"); assert(cpu_oc); @@ -281,18 +282,22 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->iram_mem); /* DRAM */ + memory_region_allocate_system_memory(ram_all, NULL, "exynos4210.ram", + ram_size); + mem_size = ram_size; if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) { - memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1", - mem_size - EXYNOS4210_DRAM_MAX_SIZE, &error_abort); - vmstate_register_ram_global(&s->dram1_mem); + memory_region_init_alias(&s->dram1_mem, NULL, "exynos4210.dram1", + ram_all, + EXYNOS4210_DRAM1_BASE_ADDR, + mem_size - EXYNOS4210_DRAM_MAX_SIZE); memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR, &s->dram1_mem); mem_size = EXYNOS4210_DRAM_MAX_SIZE; } - memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size, - &error_abort); - vmstate_register_ram_global(&s->dram0_mem); + memory_region_init_alias(&s->dram1_mem, NULL, "exynos4210.dram0", + ram_all, + EXYNOS4210_DRAM0_BASE_ADDR, mem_size); memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR, &s->dram0_mem);