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=-4.1 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, UNWANTED_LANGUAGE_BODY 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 10AD3C2D0C2 for ; Tue, 31 Dec 2019 13:36:55 +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 D0A75206DB for ; Tue, 31 Dec 2019 13:36:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BHjuRyq1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0A75206DB 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]:42596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHhd-0004NT-Db for qemu-devel@archiver.kernel.org; Tue, 31 Dec 2019 08:36:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56607) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHCS-0005p7-2N for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imHCQ-0004FX-N2 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:39 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23149 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 1imHCP-0004DN-EG for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797476; 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=z5eKLvoSmxNeslknNBjj/cRkuMOv81tM9Z0CDkmqRCw=; b=BHjuRyq1a99wxSyoJJ8eUjR//QS9hkhbOizu8L1VVDh8AeBIn80HcYv7ZjDsRtKmL+tpJd NbzJ5I3PehLjITdufkvy2LCJq3+/B111TIm6e9NxiqiClSjvGEi4L3h0xgjhQZKxXXGZWI ETA/brIJyMmgBORl/dew9IGawvUdqWw= 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-144-xfYUi-qRObafNpvguZhlQQ-1; Tue, 31 Dec 2019 08:04:35 -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 2C99D800EB8 for ; Tue, 31 Dec 2019 13:04:34 +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 A5D7678E96 for ; Tue, 31 Dec 2019 13:04:33 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 55/86] mips:mips_jazz: use memdev for RAM Date: Tue, 31 Dec 2019 14:03:39 +0100 Message-Id: <1577797450-88458-56-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: xfYUi-qRObafNpvguZhlQQ-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.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: , 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/mips/mips_jazz.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 291fd6c..5136388 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -159,7 +159,6 @@ static void mips_jazz_init(MachineState *machine, ISABus *isa_bus; ISADevice *pit; DriveInfo *fds[MAX_FD]; - MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *bios =3D g_new(MemoryRegion, 1); MemoryRegion *bios2 =3D g_new(MemoryRegion, 1); SysBusESPState *sysbus_esp; @@ -191,9 +190,7 @@ static void mips_jazz_init(MachineState *machine, cc->do_transaction_failed =3D mips_jazz_do_transaction_failed; =20 /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram", - machine->ram_size); - memory_region_add_subregion(address_space, 0, ram); + memory_region_add_subregion(address_space, 0, machine->ram); =20 memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE, &error_fatal); @@ -392,6 +389,7 @@ static void mips_magnum_class_init(ObjectClass *oc, voi= d *data) mc->init =3D mips_magnum_init; mc->block_default_type =3D IF_SCSI; mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); + mc->default_ram_id =3D "mips_jazz.ram"; } =20 static const TypeInfo mips_magnum_type =3D { @@ -408,6 +406,7 @@ static void mips_pica61_class_init(ObjectClass *oc, voi= d *data) mc->init =3D mips_pica61_init; mc->block_default_type =3D IF_SCSI; mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); + mc->default_ram_id =3D "mips_jazz.ram"; } =20 static const TypeInfo mips_pica61_type =3D { --=20 2.7.4