From nobody Sun Dec 14 06:15:19 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=1577797996; cv=none; d=zohomail.com; s=zohoarc; b=O5jnDkdLv0+7qqdHphAOBlz7ExfdJZs2MQK/WIk/AVDgFwE1YXSlWemMf0lD1Yq7ZIuzLDXWngCsB0/XCyBPNcooHwr438uJq/tjIW6YNRitzX8N/GrDFA3PZvqZ+cAWVlHsovieqgGRDIgbX80uUUVX7p0RpGngGgWBaVFSKcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577797996; 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=lZEgKo+57ODct3JCURUjhK20v4l31l3e6Fp67VhEK3Q=; b=Z6Iu1J2dJzhWNBpV5xPnRf9160LyLTyp6lzDXpVWXJAP8x+haaQv5F3Xuge6ak+XbJFS2yU/+5W8Oth/OpQMvY4tG0N2KpME/Zae8S5ISAnqmwN8cquGO41rHb/n9otHnbe42Ha+JGzDY9WslInpgOAtHt/oYyZJLDMoeDOFrtk= 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 1577797996790279.59146981757124; Tue, 31 Dec 2019 05:13:16 -0800 (PST) Received: from localhost ([::1]:42302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHKl-0000UZ-49 for importer@patchew.org; Tue, 31 Dec 2019 08:13:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54901) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHBr-0005B8-Iu for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imHBq-0002Rt-77 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54657 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 1imHBq-0002PQ-1O for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:02 -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-345-Btu_qz3HN2-XfesHWTKwyA-1; Tue, 31 Dec 2019 08:03:57 -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 BA144100551B for ; Tue, 31 Dec 2019 13:03:56 +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 4007F620A6 for ; Tue, 31 Dec 2019 13:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797441; 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=lZEgKo+57ODct3JCURUjhK20v4l31l3e6Fp67VhEK3Q=; b=Q2sugjy0LFrZ1GEZ3v6zG0TQH2hW4wo/Cg7OvyLlm7OVCB5vGfQ0bhL2wa+n+SdssePzTG kFsupm8RfbyNVBjriJ5sgHyrnzUlbweALVr/Edi9islD6eSABtjfiKVnFPH5xy1V4600Yl g2B7VYBH19hcp8UKqH6STxVSgQNjmmc= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 08/86] alpha:dp264: use memdev for RAM Date: Tue, 31 Dec 2019 14:02:52 +0100 Message-Id: <1577797450-88458-9-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: Btu_qz3HN2-XfesHWTKwyA-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.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+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: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/alpha/alpha_sys.h | 2 +- hw/alpha/dp264.c | 3 ++- hw/alpha/typhoon.c | 8 ++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index 95033d7..bc0a286 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -11,7 +11,7 @@ #include "hw/intc/i8259.h" =20 =20 -PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4], +PCIBus *typhoon_init(MemoryRegion *, ISABus **, qemu_irq *, AlphaCPU *[4], pci_map_irq_fn); =20 /* alpha_pci.c. */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index f2026fd..29439c7 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -75,7 +75,7 @@ static void clipper_init(MachineState *machine) cpus[0]->env.trap_arg2 =3D smp_cpus; =20 /* Init the chipset. */ - pci_bus =3D typhoon_init(ram_size, &isa_bus, &rtc_irq, cpus, + pci_bus =3D typhoon_init(machine->ram, &isa_bus, &rtc_irq, cpus, clipper_pci_map_irq); =20 /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ @@ -183,6 +183,7 @@ static void clipper_machine_init(MachineClass *mc) mc->max_cpus =3D 4; mc->is_default =3D 1; mc->default_cpu_type =3D ALPHA_CPU_TYPE_NAME("ev67"); + mc->default_ram_id =3D "ram"; } =20 DEFINE_MACHINE("clipper", clipper_machine_init) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 179e1f7..1795e2f 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -58,7 +58,6 @@ typedef struct TyphoonState { TyphoonCchip cchip; TyphoonPchip pchip; MemoryRegion dchip_region; - MemoryRegion ram_region; } TyphoonState; =20 /* Called when one of DRIR or DIM changes. */ @@ -817,8 +816,7 @@ static void typhoon_alarm_timer(void *opaque) cpu_interrupt(CPU(s->cchip.cpu[cpu]), CPU_INTERRUPT_TIMER); } =20 -PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, - qemu_irq *p_rtc_irq, +PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_= irq, AlphaCPU *cpus[4], pci_map_irq_fn sys_map_irq) { MemoryRegion *addr_space =3D get_system_memory(); @@ -851,9 +849,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_= bus, =20 /* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ - memory_region_allocate_system_memory(&s->ram_region, OBJECT(s), "ram", - ram_size); - memory_region_add_subregion(addr_space, 0, &s->ram_region); + memory_region_add_subregion(addr_space, 0, ram); =20 /* TIGbus, 0x801.0000.0000, 1GB. */ /* ??? The TIGbus is used for delivering interrupts, and access to --=20 2.7.4