Received: by 2002:a17:906:fcb7:b0:974:3dd3:6e73 with SMTP id qw23csp394247ejb; Thu, 1 Jun 2023 05:17:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4k6H6Qt16sZa/Apn8HgCjHo4xlYOEroFtUlBhJaIE+Q32OVaOsxLYrjpSkgiFiHsCNvVdG X-Received: by 2002:a05:6870:7702:b0:1a0:85d3:3d7a with SMTP id dw2-20020a056870770200b001a085d33d7amr3102517oab.50.1685621872363; Thu, 01 Jun 2023 05:17:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685621872; cv=none; d=google.com; s=arc-20160816; b=YfuAG1zbx1sU+5jG9fZZSktU2LEyMJJzi+GhwoebzseRXapN+Wi0qEs/HCONFMoyvQ vYvnLapcuaS3aYcleMeqfDxTPHgnWQ/dhbnCoANqHKhxzISDC/6H/j6CBww4nCHVIFjT U6Yo1U1gY2h5R2NIvJcBa86shifXbi6HrI7Navh23/th5tYXz/cDZTGSZpNGkaOreTNa H1X6rtK6dEMiKQ/Asxvq/aCSOhuTm/UyZ2umDglKK6mr8E74TixAABdwu5FIXP3VPZ2L uZqDsUu/y1tQpld0LINonARpXiZpdS8zXt37iSHOQEj6QMRjsZOfjX+EOZv8rAASZJxH 70dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jMrjKIwF2doZ7d+bJuI++1uBw5sxaxYx0JtiQurPOSc=; b=fnJ8FhUxY/wJHSCbFGqJwyL2p9PHXAzVk5zsSr1JUovb8v7a80k1pjaS7ONWXw8wHp hYIFH2VJSA0QR4DaA4TtzMr+VZjUDiJGAse1drnMJuZo4fgTyrCg5sD9j/22rAq7h/Io s0Ha56iEmHG7Bxp/nnc5rl5gxgCvnnA6ljbhjc5tobRSFWSu4qKY5Q9ZlMvF0/QfsPwR dHCDb9C+cVzVa/TPWPjnmGuOElWx+RmG9Etn0Fd1S7it3rXh9wLTS0IgZDf7yMsPAVVv AZ0weBJ8qSxeuiDXrWeoVo8eKm676l013gNZuHxziDGJ8ReFpImL3x1MjJ5RAPfhXEr6 ejWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CNs2y6F+; 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=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 bp42-20020a05622a1baa00b003f6ac42f736si8979607qtb.637.2023.06.01.05.17.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 05:17:52 -0700 (PDT) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CNs2y6F+; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4hDc-0001eA-Pz; Thu, 01 Jun 2023 08:15:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4hCo-0000TM-Ag for qemu-arm@nongnu.org; Thu, 01 Jun 2023 08:15:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4hCl-0006Px-Vc for qemu-arm@nongnu.org; Thu, 01 Jun 2023 08:15:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685621699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jMrjKIwF2doZ7d+bJuI++1uBw5sxaxYx0JtiQurPOSc=; b=CNs2y6F+IpkxnvqI6XHnQ4rZu/iKVFNE/K7V83xQiqpcRYbCUuyaZc3zwb+sg6KUhr64wc WsrBd5gaOBF5C5qtoO/aNlvNueP2e/3qW+RqD8SUgm5yYvuAGMPMlQGOywACTQlgcf3p5B jwIyaT8zgi1MgQIYic0ghmpTOUzRRY8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-iigwtuDBPD2oNpfqcToqwQ-1; Thu, 01 Jun 2023 08:14:56 -0400 X-MC-Unique: iigwtuDBPD2oNpfqcToqwQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA0F31C02D2B; Thu, 1 Jun 2023 12:14:55 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.22.8.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id A321C2166B25; Thu, 1 Jun 2023 12:14:54 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiao Guangrong , David Hildenbrand , Peter Maydell Subject: [PATCH v3 03/10] hw/arm/virt: Use machine_memory_devices_init() Date: Thu, 1 Jun 2023 14:14:40 +0200 Message-Id: <20230601121447.272487-5-david@redhat.com> In-Reply-To: <20230601121447.272487-1-david@redhat.com> References: <20230601121447.272487-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.166, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: Rl47pbWpb56y Let's use our new helper. We'll add the subregion to system RAM now earlier. That shouldn't matter, because the system RAM memory region should already be alive at that point. Cc: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: David Hildenbrand --- hw/arm/virt.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9b9f7d9c68..087e7059c7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1817,10 +1817,7 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits) virt_set_high_memmap(vms, base, pa_bits); if (device_memory_size > 0) { - ms->device_memory = g_malloc0(sizeof(*ms->device_memory)); - ms->device_memory->base = device_memory_base; - memory_region_init(&ms->device_memory->mr, OBJECT(vms), - "device-memory", device_memory_size); + machine_memory_devices_init(ms, device_memory_base, device_memory_size); } } @@ -2261,10 +2258,6 @@ static void machvirt_init(MachineState *machine) 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); - } virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); -- 2.40.1