From nobody Mon Feb 9 08:10:22 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579780745; cv=none; d=zohomail.com; s=zohoarc; b=XoGruS0+txGzAYaqNb0e9ppLvHmJbMvrlHP4nQQXgpo4uEmfa9tafEotH/jau92HLVnCIT/3VeLtsReCFYh+/CzezgLmkRiKPJ/tBNkyEKZH8yfotyrQ/3+FYGxwEW0ppt3lUtPm49R9Sg/m9Nrv2od1/k82ZHn+44Vk1hAN8qU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579780745; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dz70oqDjFQy03gviNg94YnDsOuTXGG0wlC186/lFKRU=; b=jHtt+jP7Ikv5cv7cfujmtwFe8nmNaWBQUH/DFiTg2Be3pW4/McSoDlSXjbHV4xbULNs6fyQLDhYNin+WbJQyLctHXMWQgGz4RS/i5dqSvCoKYQVEWV1HzMWHvD4hTTde4wuaNsgpZXJVb6lvV4vFByUgMRPHpLArffAMI7RHvM0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1579780745953951.3001220897557; Thu, 23 Jan 2020 03:59:05 -0800 (PST) Received: from localhost ([::1]:55488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub8Z-0000z6-Md for importer@patchew.org; Thu, 23 Jan 2020 06:59:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35305) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuarx-0005ei-0o for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuaru-0004IR-Qv for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:52 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:46229 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 1iuaru-0004IK-Nb for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:50 -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-119-sHAtqkXqN8q0Td_nSc1jAQ-1; Thu, 23 Jan 2020 06:41:48 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77C1C800D5C; Thu, 23 Jan 2020 11:41:47 +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 43AD81001DD7; Thu, 23 Jan 2020 11:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dz70oqDjFQy03gviNg94YnDsOuTXGG0wlC186/lFKRU=; b=b+6xuxy3eS1vPCgIttMs+hZQP/RQ4kFx9yHO9/WIq3QaOVeqZCkz4nGkH0D3D7wZ0nz9hZ bGM1kYHEFQXUrghxCMbCGo8fBneWB+4pIKG8aUwSkiafpzgnQRdj2c2wZ8JQX9FhZxfHF7 sMaNpIXtobLbywN6oAqaak03hJQijjo= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 22/80] arm/musicpal: use memdev for RAM Date: Thu, 23 Jan 2020 12:37:47 +0100 Message-Id: <1579779525-20065-23-git-send-email-imammedo@redhat.com> In-Reply-To: <1579779525-20065-1-git-send-email-imammedo@redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: sHAtqkXqN8q0Td_nSc1jAQ-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: 207.211.31.81 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: peter.maydell@linaro.org, drjones@redhat.com, qemu-arm@nongnu.org, jan.kiszka@web.de Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. PS: while at it add check for user supplied RAM size and error out if it mismatches board expected value. Signed-off-by: Igor Mammedov Reviewed-by: Andrew Jones =20 --- v2: * fix format string causing build failure on 32-bit host (Philippe Mathieu-Daud=C3=A9 ) CC: drjones@redhat.com CC: jan.kiszka@web.de CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/musicpal.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index f68a399..c6418b0 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -32,6 +32,7 @@ #include "sysemu/runstate.h" #include "exec/address-spaces.h" #include "ui/pixel_ops.h" +#include "qemu/cutils.h" =20 #define MP_MISC_BASE 0x80002000 #define MP_MISC_SIZE 0x00001000 @@ -1589,16 +1590,21 @@ static void musicpal_init(MachineState *machine) int i; unsigned long flash_size; DriveInfo *dinfo; + MachineClass *mc =3D MACHINE_GET_CLASS(machine); MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *sram =3D g_new(MemoryRegion, 1); =20 + /* For now we use a fixed - the original - RAM size */ + if (machine->ram_size !=3D mc->default_ram_size) { + char *sz =3D size_to_str(mc->default_ram_size); + error_report("Invalid RAM size, should be %s", sz); + g_free(sz); + exit(EXIT_FAILURE); + } + cpu =3D ARM_CPU(cpu_create(machine->cpu_type)); =20 - /* For now we use a fixed - the original - RAM size */ - memory_region_allocate_system_memory(ram, NULL, "musicpal.ram", - MP_RAM_DEFAULT_SIZE); - memory_region_add_subregion(address_space_mem, 0, ram); + memory_region_add_subregion(address_space_mem, 0, machine->ram); =20 memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE, &error_fatal); @@ -1714,6 +1720,8 @@ static void musicpal_machine_init(MachineClass *mc) mc->init =3D musicpal_init; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("arm926"); + mc->default_ram_size =3D MP_RAM_DEFAULT_SIZE; + mc->default_ram_id =3D "musicpal.ram"; } =20 DEFINE_MACHINE("musicpal", musicpal_machine_init) --=20 2.7.4