From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7075434lff; Wed, 15 Jan 2020 07:38:39 -0800 (PST) X-Google-Smtp-Source: APXvYqy+dcRtXRswPfps+D12YCG2tAsh2mt7f6bKbBR63R40Pr0+u9YH9NYPpNpV4qkIC8jRLVgt X-Received: by 2002:a05:620a:12c4:: with SMTP id e4mr23817262qkl.359.1579102719472; Wed, 15 Jan 2020 07:38:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579102719; cv=none; d=google.com; s=arc-20160816; b=YjLxzSc5ur/0TvcphcakLumu1U4bMitj2UCFF1v6irHyKhq6LPO6TpF9Kk51cy0GJe QxboJMerkr9ytxTCymmHgVajFKmjNgiNOwxB0WX4Qe4yfjLt9PZ+b/nbm4bdx657WGjm gHzCziBPYGzRKMRSsOsW9AnUzIdsOxko4HwHA3lWcqPc/hfD3LcL90z1jSo2W8xfmtMz TwdiHi4jFgdeAi26DXV9mia1odjP9wbRGufqSPEN2cIkymC+1epR4KC7E2QaTxwZYXmQ +5hJ+WGkyRJPmdDfYytvyHFH+6LdUCwo+CLbKvvn5+PpqjehxeMyECD3O2uznYYSjm2h RvCQ== 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=nnkWfqZgLL9NyjYJbbglm28wjhMlX3z/tFvLQGDTGbY=; b=DZUFlzasNmlpXmybgxGh8VAoxm3htFObDr3SJbHOZCcMBL7JCF0bAekSRrK1tVJemL 6UHWxpjYSvKsWSDEB5MRYO8wG4envCy4Q/SLERApDhhOYDaYzbfF6IyhkZKARZOtRvBO gWnI1rtS5pusRWMi/OLjCCH32fWXoQlQVMI822hFFDJC7CGoUsZjnUhqr0awTkyGAcgu JZKQnfUU1umY1aFqTTytkagICE1BlVUPJYjNQSP8I9EDjPgJJFjPewpIsv1/tKXgDxsS +COjoOC3AYFYczd/Lo7CdPp98KhqKszkZTV/0eTs+eMjl/CBjfTFSfNR/n7O1RJhhD9X 2bDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=WrBFB7sJ; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (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 x20si10323504qkj.83.2020.01.15.07.38.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:38:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-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=fail header.i=@redhat.com header.s=mimecast20190719 header.b=WrBFB7sJ; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkkg-0005TZ-71 for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:38:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49211) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkKI-00085c-Sc for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkKH-0008PI-Mo for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45573 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 1irkKH-0008OE-I1 for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101080; 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=nnkWfqZgLL9NyjYJbbglm28wjhMlX3z/tFvLQGDTGbY=; b=WrBFB7sJ4/N7QLfeGB1rFEPeiVx5xsLQ5zbl9Z6hdhK1j2nUFsZoFZQGTATCfHTiQeSz4c /GWUPyN1seGclw/UM2x8pUPiloT5e5deFRCxYYRnrCwbi29GOHXysih5fZDDd9CZsgWxuq vGAyPNSqIY4mp0em2lxYMvV64nTtMxI= 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-414-4TbMnQAROaqWNC9rD8vTWA-1; Wed, 15 Jan 2020 10:11:19 -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 E79DB1098D2E; Wed, 15 Jan 2020 15:11:17 +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 EA6A819757; Wed, 15 Jan 2020 15:11:16 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 33/86] arm:virt: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:48 +0100 Message-Id: <1579100861-73692-34-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: 4TbMnQAROaqWNC9rD8vTWA-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-arm@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, drjones@redhat.com, qemu-arm@nongnu.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: CnCYJIX00oK/ 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 then map memory region provided by MachineState::ram_memdev Signed-off-by: Igor Mammedov --- CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org CC: drjones@redhat.com --- hw/arm/virt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 39ab5f4..e2fbca3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1512,7 +1512,6 @@ static void machvirt_init(MachineState *machine) MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *secure_sysmem =3D NULL; int n, virt_max_cpus; - MemoryRegion *ram =3D g_new(MemoryRegion, 1); bool firmware_loaded; bool aarch64 =3D true; bool has_ged =3D !vmc->no_ged; @@ -1701,9 +1700,8 @@ static void machvirt_init(MachineState *machine) } } =20 - memory_region_allocate_system_memory(ram, NULL, "mach-virt.ram", - machine->ram_size); - memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, ram); + memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, + machine->ram); if (machine->device_memory) { memory_region_add_subregion(sysmem, machine->device_memory->base, &machine->device_memory->mr); @@ -2053,6 +2051,7 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) hc->unplug_request =3D virt_machine_device_unplug_request_cb; mc->numa_mem_supported =3D true; mc->auto_enable_numa_with_memhp =3D true; + mc->default_ram_id =3D "mach-virt.ram"; } =20 static void virt_instance_init(Object *obj) --=20 2.7.4