From nobody Fri Dec 19 13:22:56 2025 Delivered-To: importer@patchew.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=1689150059; cv=none; d=zohomail.com; s=zohoarc; b=iv7a39wlJ79AIkEYSVjaY9ddj2TdKC0h7pPxqb73Nj9YY5eY3bfDbgzMct0m/wh0xH1HiHtMCm1VdxHDQSHwSIvHkoKisQZohLDU0VaWMwiPPRDBP0CWyrZv7qysUsyxWp09ZEN6CuOU7vycgd8yWUHZQp18uzxjORiQLRp0ugY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689150059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E5WRSnORhkDV1YKjfFriAN1JmW+VjyDgLIKpLCwwDpM=; b=FKShULhd/H1QKRfn+LajD38/6BxOP1GG8Mir0ZNJi1X7fGOU1e+Pz2eB4VqlEY8D/RRsB1ugcCCm8ahITAt/gkbaBRwg7AV1whMGq7FbW43ctkcs3Q2GHnanF91M5pDtAyPAMyNlTUh5E0PpG/M7mOZB4UwdP2xOWP5jK+X0xY0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689150059943374.85491005203005; Wed, 12 Jul 2023 01:20:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJV35-00045a-AY; Wed, 12 Jul 2023 04:18:11 -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 1qJV2w-0003zu-6a for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:02 -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 1qJV2u-0000Sb-Re for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:01 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-321-CrbHoL_ROcqRt1zQSJ6sKA-1; Wed, 12 Jul 2023 04:17:58 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 64E851010429; Wed, 12 Jul 2023 08:17:58 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09829492C13; Wed, 12 Jul 2023 08:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689149880; 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=E5WRSnORhkDV1YKjfFriAN1JmW+VjyDgLIKpLCwwDpM=; b=LAlPkJ2KXESHKGqN+HFIQ8hm0t6qbPacFS0c2u2lOK1jCiGO/v715THV0ldyK3dN/OWAHP J8c6VmtrKWn5I5CkjoNpD9EKrpLnbJX/mDKe/OEv3RzI12ie32WWssQnfbW3dqnkyQbPsP f8wXHtJ7RhvpRnLDGoVY8Pl1Nu3M8tQ= X-MC-Unique: CrbHoL_ROcqRt1zQSJ6sKA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , "Michael S . Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [GIT PULL 03/21] hw/arm/virt: Use machine_memory_devices_init() Date: Wed, 12 Jul 2023 10:17:32 +0200 Message-ID: <20230712081750.80852-4-david@redhat.com> In-Reply-To: <20230712081750.80852-1-david@redhat.com> References: <20230712081750.80852-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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; 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@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-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689150061063100003 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=C3=A9 Signed-off-by: David Hildenbrand Message-Id: <20230623124553.400585-4-david@redhat.com> 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 8a4c663735..0546e43448 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1813,10 +1813,7 @@ static void virt_set_memmap(VirtMachineState *vms, i= nt pa_bits) virt_set_high_memmap(vms, base, pa_bits); =20 if (device_memory_size > 0) { - ms->device_memory =3D g_malloc0(sizeof(*ms->device_memory)); - ms->device_memory->base =3D 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); } } =20 @@ -2257,10 +2254,6 @@ static void machvirt_init(MachineState *machine) =20 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); - } =20 virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); =20 --=20 2.41.0