From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7070740lff; Wed, 15 Jan 2020 07:34:44 -0800 (PST) X-Google-Smtp-Source: APXvYqwv/28Tuvp0BuNyh43jLcUHSnDP7eITPOwzMJbTU01Bvwj0hGaGfqklHB7nxonp43fQDFBa X-Received: by 2002:a17:906:c7d5:: with SMTP id dc21mr28750928ejb.316.1579102484360; Wed, 15 Jan 2020 07:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579102484; cv=none; d=google.com; s=arc-20160816; b=FhQl+hax4lM/f9CebuTBAta+tZcwrnZPIvPTPMlvUBOBUx9jjHITxr045D/n8JyqK6 DI/G7OqvA9SUEDk3HmVFOmXTDBd0jvZGr5yj3jXbOm9IAooKJ2+Pu63OT6ghIpV9GLxN qYURf19CX7KqR2DZ0iKQgDc3N3t/eZk3ROsOUt/JuXFxlrHVS7j5psuG4U/2Hyinp4p3 ImqcT5bGB2O2PN8priDjMLfYdxJCtA4+xlhvVVc7/AFL0WQx0Jk2NjAm12ccOFOIYjxS 6B9kWwI0cb59ulnN2JzqUDak+KVQi3Nf7Yswah469nItj0h7lVLCrwHfqz/Y37HWsFDJ JG+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SagVUdG2WaGuT4qgYSl7NBvOsnHYzLbuOb0tXuQrz/E=; b=dQECLBNLZ+XPamDOzXLhqSKTJRpvL0mW1kGk+soaqIiM9E890EE95xkzGSWtVqqC4o rb8cbmALbKAKLraAhRiDKEg4/pIT5Ncb1OEZKPUAEuuCpJ+5fG79P9VJxyUW0/DjQKyA s9t8sAKDVt05HrBILCpzmO7GAInqmEP/HXa3CJJ3OfuR4y99j34mLZNc5YJTg2e5qvNR PW7At9VJT3XrA2XqZPfZ75qYK/cN5lrBXIWgERLctkVLuIMu2WAWjgkAVcYUU9hntyqc uqc8/3m5IcHK80qKdikkf2PV3xk29VvX22NDfDO12XPAWVawcHsItrnLxseiReD0OUq1 ztPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cSf1PnGi; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id co5si14385543edb.203.2020.01.15.07.34.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:34:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cSf1PnGi; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkgs-0007og-OA for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:34:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49166) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkKH-00082u-Hp for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkKF-0008Nn-M2 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:21 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25752 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irkKF-0008NK-GX for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101078; 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=SagVUdG2WaGuT4qgYSl7NBvOsnHYzLbuOb0tXuQrz/E=; b=cSf1PnGi8lDY40QXYxMAw2ymoysRcojzIuKhf4aIEu/vBgFD+PT0U1vi7zsCItmQ0wyALw fkJL/jGlHrcPggbItun5LIMBbpWBRgHuoE6iVGmR1OdOjD32o1B+4lVKiCBgNDyruI8PZX 9iWeq9CIGekjnimYSH2dixZ+tUGnXeg= 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-261-y6IR6RL4OkaWq1BbcMOYrg-1; Wed, 15 Jan 2020 10:11:15 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6366892735B; Wed, 15 Jan 2020 15:11:14 +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 3EB77196AE; Wed, 15 Jan 2020 15:11:13 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 30/86] arm:sbsa-ref: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:45 +0100 Message-Id: <1579100861-73692-31-git-send-email-imammedo@redhat.com> In-Reply-To: <1579100861-73692-1-git-send-email-imammedo@redhat.com> References: <1579100861-73692-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: y6IR6RL4OkaWq1BbcMOYrg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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, qemu-arm@nongnu.org, radoslaw.biernacki@linaro.org, leif.lindholm@linaro.org Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: H5O0gP+rcLew 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 --- CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org CC: radoslaw.biernacki@linaro.org CC: leif.lindholm@linaro.org --- hw/arm/sbsa-ref.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 9b5bcb5..1cba9fc 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -593,7 +593,6 @@ static void sbsa_ref_init(MachineState *machine) MachineClass *mc =3D MACHINE_GET_CLASS(machine); MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *secure_sysmem =3D g_new(MemoryRegion, 1); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); bool firmware_loaded; const CPUArchIdList *possible_cpus; int n, sbsa_max_cpus; @@ -685,9 +684,8 @@ static void sbsa_ref_init(MachineState *machine) object_unref(cpuobj); } =20 - memory_region_allocate_system_memory(ram, NULL, "sbsa-ref.ram", - machine->ram_size); - memory_region_add_subregion(sysmem, sbsa_ref_memmap[SBSA_MEM].base, ra= m); + memory_region_add_subregion(sysmem, sbsa_ref_memmap[SBSA_MEM].base, + machine->ram); =20 create_fdt(sms); =20 @@ -785,6 +783,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *= data) mc->block_default_type =3D IF_IDE; mc->no_cdrom =3D 1; mc->default_ram_size =3D 1 * GiB; + mc->default_ram_id =3D "sbsa-ref.ram"; mc->default_cpus =3D 4; mc->possible_cpu_arch_ids =3D sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D sbsa_ref_cpu_index_to_props; --=20 2.7.4