From nobody Fri Dec 19 13:22:55 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=1689150003; cv=none; d=zohomail.com; s=zohoarc; b=bclY6BEXrKb5bRT69DBH0ONPluXmt/0s9SotJ4uSsl0lEmYp/frEQwxhF3mBD7nBGCUo94fTBiKOA+n0hxv1AzBxEeWikSnZM0IVdJHlJYgizJFFNR6OANJkC7K1jj6TJ/enqrqHkTSyhAgyxP9RS62ngeQU6cBDusAEVb/Z0Og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689150003; 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=C4sXXosBu7w1mcNPbQSJ9Qi/qhpcYknFx5VRdPW0o4g=; b=Td39Ny0mJMODuaYLl8zfhiClfIPns8stB6dWvk/vxcuDYeLxRwXx0Jgmep4/iQWlgjaSf5SaJIaIZWPfPCeg5MY8wo/NW6y6GShcZrqJmXaLtHBNhvI4jkJha4fmKN6sTEKBJ69Yjpm0YLJmMt+H9sgSeEijAPL5bJNPHpvygmw= 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 1689150003628571.7809788263374; Wed, 12 Jul 2023 01:20:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJV38-00047L-7k; Wed, 12 Jul 2023 04:18:14 -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 1qJV36-00046W-67 for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:12 -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 1qJV34-0000Vh-Jf for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:11 -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-55-dSg9-wYaPXWtsnvMEiU1wA-1; Wed, 12 Jul 2023 04:18:06 -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 1122A86F121; Wed, 12 Jul 2023 08:18:06 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DBC3492C13; Wed, 12 Jul 2023 08:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689149890; 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=C4sXXosBu7w1mcNPbQSJ9Qi/qhpcYknFx5VRdPW0o4g=; b=SN+RrpHygANHiWQMYQdVcKwyMkXtqZHLrT7iFSEqo2+MFGhqgm66oNDgXBM03hvUnklCc9 UKEoRCoF3854nMIkiH0p8mFJKdChQ7cFhDmdiDsBw690SydqC0bnP/L4OdYD6DcG4o4WVH yPzYI2FZID29Kasb/U8Qg5QB5fzNs2Q= X-MC-Unique: dSg9-wYaPXWtsnvMEiU1wA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , "Michael S . Tsirkin" , Paolo Bonzini , David Hildenbrand , Xiaojuan Yang , Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [GIT PULL 05/21] hw/loongarch/virt: Use machine_memory_devices_init() Date: Wed, 12 Jul 2023 10:17:34 +0200 Message-ID: <20230712081750.80852-6-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: 1689150005582100019 Let's use our new helper. While at it, use VIRT_HIGHMEM_BASE. Cc: Xiaojuan Yang Cc: Song Gao Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Song Gao Signed-off-by: David Hildenbrand Message-Id: <20230623124553.400585-6-david@redhat.com> Signed-off-by: David Hildenbrand --- hw/loongarch/virt.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 51a453fa9a..e19b042ce8 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -857,8 +857,8 @@ static void loongarch_init(MachineState *machine) =20 /* initialize device memory address space */ if (machine->ram_size < machine->maxram_size) { - machine->device_memory =3D g_malloc0(sizeof(*machine->device_memor= y)); ram_addr_t device_mem_size =3D machine->maxram_size - machine->ram= _size; + hwaddr device_mem_base; =20 if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) { error_report("unsupported amount of memory slots: %"PRIu64, @@ -873,14 +873,8 @@ static void loongarch_init(MachineState *machine) exit(EXIT_FAILURE); } /* device memory base is the top of high memory address. */ - machine->device_memory->base =3D 0x90000000 + highram_size; - machine->device_memory->base =3D - ROUND_UP(machine->device_memory->base, 1 * GiB); - - memory_region_init(&machine->device_memory->mr, OBJECT(lams), - "device-memory", device_mem_size); - memory_region_add_subregion(address_space_mem, machine->device_mem= ory->base, - &machine->device_memory->mr); + device_mem_base =3D ROUND_UP(VIRT_HIGHMEM_BASE + highram_size, 1 *= GiB); + machine_memory_devices_init(machine, device_mem_base, device_mem_s= ize); } =20 /* Add isa io region */ --=20 2.41.0