From nobody Sun Feb 8 22:34:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582128953; cv=none; d=zohomail.com; s=zohoarc; b=E884X7pr6AXEAppjCiaz/1hkEgwSGGQ/YN2ik9E5Nx41RoPemXQN4s6k/TzbYOTjE59FWTEAsKv4DtU3j9HTkL3ia2uEXpBMAIszV1JxNZMlQliZtDzPcSsAohJyYUN0a0/+Ls3RQBBazBcB+O9DA8P6QyiQLsbntfpg76XmjFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582128953; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=iKsJlQQfKO++kC+PU2/flKoHQv0D+6YCtXsIoUdmn9w=; b=NBmTOXVvFUiA1bc8MZoHjKeQ6RI7zkZ76uEcKDd/2Z+mr7+y3naRbERV4KpYExVAj993z4zpikM7mH/dcWHf1muRpIfvX7gT1hQrxMG2UmapIwpJ4c+2Kd68KbdO5LCjt7FHVjVxu9S1o0OyNsrzBco1cK4iJFhoHeOYKOEHkRo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582128953046284.90619570374406; Wed, 19 Feb 2020 08:15:53 -0800 (PST) Received: from localhost ([::1]:55488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4S0t-0003yv-Sk for importer@patchew.org; Wed, 19 Feb 2020 11:15:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37162) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Rvb-0002Wo-6W for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4RvZ-0000bt-UO for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:23 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:48018 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4RvZ-0000bW-QB for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-Gq_gbmHnO2yCqdbutg7k8g-1; Wed, 19 Feb 2020 11:10:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 655D08EF890; Wed, 19 Feb 2020 16:10:17 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5991348; Wed, 19 Feb 2020 16:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582128621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iKsJlQQfKO++kC+PU2/flKoHQv0D+6YCtXsIoUdmn9w=; b=alY9AWYx41A8Lmor+jOXLi8u7XR4j2QPxMwmp+aw4ROc3gHc4buZvBHOgooSETq5StGjhd Agr0aHakptL2ImyHbRJqV16g/ZgLFARqK1inA3YkJD+fON4vfrgjznL88gy9i1qP0kSFqp K8M6RDBRtVUtGE73xp0dTE2hHqGBULw= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v6 17/79] arm/integratorcp: use memdev for RAM Date: Wed, 19 Feb 2020 11:08:51 -0500 Message-Id: <20200219160953.13771-18-imammedo@redhat.com> In-Reply-To: <20200219160953.13771-1-imammedo@redhat.com> References: <20200219160953.13771-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Gq_gbmHnO2yCqdbutg7k8g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , peter.chubb@nicta.com.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" memory_region_allocate_system_memory() API is going away, so replace it with memdev allocated MemoryRegion. The later is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. Signed-off-by: Igor Mammedov Reviewed-by: Andrew Jones Reviewed-by: Richard Henderson --- CC: peter.chubb@nicta.com.au --- hw/arm/integratorcp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 0cd94d9f09..cc845b8534 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -585,7 +585,6 @@ static void integratorcp_init(MachineState *machine) Object *cpuobj; ARMCPU *cpu; MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *ram_alias =3D g_new(MemoryRegion, 1); qemu_irq pic[32]; DeviceState *dev, *sic, *icp; @@ -605,14 +604,13 @@ static void integratorcp_init(MachineState *machine) =20 cpu =3D ARM_CPU(cpuobj); =20 - memory_region_allocate_system_memory(ram, NULL, "integrator.ram", - ram_size); /* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash= . */ /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero*/ - memory_region_add_subregion(address_space_mem, 0, ram); + memory_region_add_subregion(address_space_mem, 0, machine->ram); /* And again at address 0x80000000 */ - memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_siz= e); + memory_region_init_alias(ram_alias, NULL, "ram.alias", machine->ram, + 0, ram_size); memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias); =20 dev =3D qdev_create(NULL, TYPE_INTEGRATOR_CM); @@ -660,6 +658,7 @@ static void integratorcp_machine_init(MachineClass *mc) mc->init =3D integratorcp_init; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("arm926"); + mc->default_ram_id =3D "integrator.ram"; } =20 DEFINE_MACHINE("integratorcp", integratorcp_machine_init) --=20 2.18.1