From nobody Sun Dec 14 06:15:46 2025 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=1577799400; cv=none; d=zohomail.com; s=zohoarc; b=e8hX+bj8OiUxQI7wqTSBao3pzhpnpuxEraAL4BGUOvFPEMYGYyd3Im6Vri0SwBHKWxriHRCAEbt9aQcjmof/vIwQawZvVjvrfkm9UpW8HS+U3uPb77B0fhoxzBzOzprPYY8ydVDU1nh/9xcRCbKVhMKxroRhvNmriZLIdLwmlOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577799400; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dbYTAgijA83otGOy/65k9Eb1JKTkbpEyZTmzhbwFtuM=; b=ftcc2lbCsgzRBLWA0gniVuUlzX5RzFloj1Gq27sYv42sXKp61v1J8JAs1pVcYCkGhHC2jdQmMCq9Xd+V5nEZIPzJz958BSlw5R2m+nA6vtp3TZXu0mxGzG/Kkev8PukMHRLYULEVLUW1bqJeC8ypYkEO1ZSGWRT68mjSHtlaE9I= 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 1577799400072806.0171418946578; Tue, 31 Dec 2019 05:36:40 -0800 (PST) Received: from localhost ([::1]:42592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHhN-0003pI-KE for importer@patchew.org; Tue, 31 Dec 2019 08:36:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHCR-0005oo-Ui 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 1imHCO-0004CK-Qk for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:38 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:40671 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 1imHCO-00049z-I8 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:36 -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-267-vp7lG3bUMYiSHem5FHPk3w-1; Tue, 31 Dec 2019 08:04:31 -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 F2AF810054E3 for ; Tue, 31 Dec 2019 13:04:30 +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 7954678E96 for ; Tue, 31 Dec 2019 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797474; 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=dbYTAgijA83otGOy/65k9Eb1JKTkbpEyZTmzhbwFtuM=; b=BKNyulty99Y69xMeQMFpVa7MkQQ5JynuRy+Z1QaGG9GjxqhtfPwESMr8/Lxs8prye2/p+J LxWP2HAej7DNOkGtozgqNfSMyFZ1PPuHe5GkiNtZJcn3QuvRqmweZRP46BgV/+XZEoknX8 B/OlvgvfrZxlG7slli2MJPqOemG+PmA= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 51/86] m68k:next-cube: use memdev for RAM Date: Tue, 31 Dec 2019 14:03:35 +0100 Message-Id: <1577797450-88458-52-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: vp7lG3bUMYiSHem5FHPk3w-1 X-Mimecast-Spam-Score: 0 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.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: , 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 Acked-by: Thomas Huth --- hw/m68k/next-cube.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e534334..cd93d9e 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -860,7 +860,6 @@ static void next_cube_init(MachineState *machine) { M68kCPU *cpu; CPUM68KState *env; - MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *rom =3D g_new(MemoryRegion, 1); MemoryRegion *mmiomem =3D g_new(MemoryRegion, 1); MemoryRegion *scrmem =3D g_new(MemoryRegion, 1); @@ -893,8 +892,7 @@ static void next_cube_init(MachineState *machine) memcpy(ns->rtc.ram, rtc_ram2, 32); =20 /* 64MB RAM starting at 0x04000000 */ - memory_region_allocate_system_memory(ram, NULL, "next.ram", ram_size); - memory_region_add_subregion(sysmem, 0x04000000, ram); + memory_region_add_subregion(sysmem, 0x04000000, machine->ram); =20 /* Framebuffer */ dev =3D qdev_create(NULL, TYPE_NEXTFB); @@ -967,6 +965,7 @@ static void next_machine_class_init(ObjectClass *oc, vo= id *data) mc->desc =3D "NeXT Cube"; mc->init =3D next_cube_init; mc->default_ram_size =3D RAM_SIZE; + mc->default_ram_id =3D "next.ram"; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); } =20 --=20 2.7.4