From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7065846lff; Wed, 15 Jan 2020 07:31:01 -0800 (PST) X-Google-Smtp-Source: APXvYqzjIxhAG/x7auWjF6Jn4iKo5/Twp47WXnYdRgI35rIyCMyyZrrCYoObDOHZRCD/ld9zS9GJ X-Received: by 2002:a05:6402:2042:: with SMTP id bc2mr30992245edb.300.1579102261887; Wed, 15 Jan 2020 07:31:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579102261; cv=none; d=google.com; s=arc-20160816; b=sqRK4sRJgu/vKtamfEzh72VxDXjCt2xg9lfRKiC3knF+5AHmfLLQ6/ss+w/WDQNrT7 yPNrMCFw+JRTMdFaAO7XOZn0jxSoWDWhFmb2lsvlN9N1Tngi5GMnniRkc9/hzyW3Nh6O qtXvOdU0mO98E1fl94reJSJFJz4ZWV4w612iIVao6cxyAmo/dSblVqJ2lSYN+64oD54e P7+YmjG+3xH2HD1TWU1Nqe+nq89fm8l/PO+N6AuPugH+oBQYss9GmdcD6IP6wKSk9E5s XxDWkOCE0LgduiLcAOY6uyfbivExL1RVqQvkA/UNjCyeizTOyrDsQzp7cKflTTWTH34Q J9rw== 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=zgHH2SwpVB9yr1iiztjM3jhFax+dJqyn+USZPKYKRxI=; b=o+/fOXdq9+V4Wy90dyLNT3RSXzFFvOGNTUy8yugFbue3FXQbubcDqI2jDVYaqZI/Jl bJGwtSrFBTvTICku0yWaF9zrw0YqK6r1hFBn3UHtTchxF6JOfjpUI5U0bzp9Hao6I9v3 ovNSvllLmTLZicj4+Et8g78c5q/Oqquq6Cj+ujmAsgPpFIEu+qpPVNQNFILGkg/SMZ12 0th5C6xPSr2JdlHDE3SSb0oa6pwCcpIu/PLoVx+/1hZnDUwfTI7ZRUIdrM9CHNTj7G0w QyNNIRGkjsL5J75cv7fgHZtii88o6UBNykDBu+LDADLdWfHzShgs9/NxGFhnI6ldVSNc v4lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UZhIITiH; 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 t16si12537919eju.12.2020.01.15.07.31.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:31:01 -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=UZhIITiH; 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]:55844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkdI-0003ax-8g for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:31:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49167) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkKH-00082x-Jf 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 1irkKE-0008NB-RP for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:21 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32691 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 1irkKE-0008MI-79 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101077; 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=zgHH2SwpVB9yr1iiztjM3jhFax+dJqyn+USZPKYKRxI=; b=UZhIITiHJtGIrMr9kie80rLfNxnrqGECGWA0BRSlkCrDtRzn+AvVm17nO99gjVt/l2nXx8 NY6iA91Cyas2Md3CxX6C3oI3miKqzR8xXLUhPvmbsD6/ghXr8fdtQ7uTnYmgjSnInkoI7C Ooz6thJ6PCotnM9nJIJP+z66CJdk6cI= 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-147-Oo6bPFHjMa6JKyKgYniv2A-1; Wed, 15 Jan 2020 10:11:16 -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 80A65176F89; Wed, 15 Jan 2020 15:11:15 +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 ACE4E28992; Wed, 15 Jan 2020 15:11:14 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 31/86] arm:versatilepb: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:46 +0100 Message-Id: <1579100861-73692-32-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: Oo6bPFHjMa6JKyKgYniv2A-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.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: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: u+xsfMzqAi/B 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 --- hw/arm/versatilepb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index e86af01..f3c4a50 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -184,7 +184,6 @@ static void versatile_init(MachineState *machine, int b= oard_id) Object *cpuobj; ARMCPU *cpu; MemoryRegion *sysmem =3D get_system_memory(); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); qemu_irq pic[32]; qemu_irq sic[32]; DeviceState *dev, *sysctl; @@ -220,11 +219,9 @@ static void versatile_init(MachineState *machine, int = board_id) =20 cpu =3D ARM_CPU(cpuobj); =20 - memory_region_allocate_system_memory(ram, NULL, "versatile.ram", - machine->ram_size); /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ - memory_region_add_subregion(sysmem, 0, ram); + memory_region_add_subregion(sysmem, 0, machine->ram); =20 sysctl =3D qdev_create(NULL, "realview_sysctl"); qdev_prop_set_uint32(sysctl, "sys_id", 0x41007004); @@ -398,6 +395,7 @@ static void versatilepb_class_init(ObjectClass *oc, voi= d *data) mc->block_default_type =3D IF_SCSI; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("arm926"); + mc->default_ram_id =3D "versatile.ram"; } =20 static const TypeInfo versatilepb_type =3D { @@ -415,6 +413,7 @@ static void versatileab_class_init(ObjectClass *oc, voi= d *data) mc->block_default_type =3D IF_SCSI; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("arm926"); + mc->default_ram_id =3D "versatile.ram"; } =20 static const TypeInfo versatileab_type =3D { --=20 2.7.4