From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 562B4C2D0C2 for ; Tue, 31 Dec 2019 13:52:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 25137206E4 for ; Tue, 31 Dec 2019 13:52:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bXVc1wcD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25137206E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHwy-0000YO-Pz for qemu-devel@archiver.kernel.org; Tue, 31 Dec 2019 08:52:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57282) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHCe-00065s-Ie for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imHCd-0004qu-4R for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:52 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26185 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 1imHCc-0004o8-Qb for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSr1npakF22zV6oJnTvdC1T4WSzePj+YqcCKL2XUvvE=; b=bXVc1wcDWYe/s0zBQmyBthun4lgla+yHSYFarqGpkPk8a6EkuRTBjPrbccp6Ccao9rhgl3 fbciwPBTAo1yUV1nbPIXZNW0xUPRi0ko7nr9H1VVNqyg2sk6tRoprzogg0qLPiBKeqDkEc a6d2M4uloGqPAmbgBQbiOFUC7I6CO08= 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-222-xv0EwYkhOVWflUfsCpZH9w-1; Tue, 31 Dec 2019 08:04:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A71C8DB64 for ; Tue, 31 Dec 2019 13:04: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 2E14A620A6 for ; Tue, 31 Dec 2019 13:04:47 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 72/86] sparc:leon3: use memdev for RAM Date: Tue, 31 Dec 2019 14:03:56 +0100 Message-Id: <1577797450-88458-73-git-send-email-imammedo@redhat.com> In-Reply-To: <1577797450-88458-1-git-send-email-imammedo@redhat.com> References: <1577797450-88458-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: xv0EwYkhOVWflUfsCpZH9w-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: 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- hw/sparc/leon3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index c5f1b1e..19927d1 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -184,7 +184,6 @@ static void leon3_generic_hw_init(MachineState *machine= ) SPARCCPU *cpu; CPUSPARCState *env; MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *prom =3D g_new(MemoryRegion, 1); int ret; char *filename; @@ -244,8 +243,8 @@ static void leon3_generic_hw_init(MachineState *machine= ) exit(1); } =20 - memory_region_allocate_system_memory(ram, NULL, "leon3.ram", ram_size)= ; - memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET, ram); + memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET, + machine->ram); =20 /* Allocate BIOS */ prom_size =3D 8 * MiB; @@ -351,6 +350,7 @@ static void leon3_generic_machine_init(MachineClass *mc= ) mc->desc =3D "Leon-3 generic"; mc->init =3D leon3_generic_hw_init; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("LEON3"); + mc->default_ram_id =3D "leon3.ram"; } =20 DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init) --=20 2.7.4