From nobody Mon Feb 9 18:46:20 2026 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=1606899316; cv=none; d=zohomail.com; s=zohoarc; b=T2XUYldOX80fyAi7e2KId7cf/3asSJLvferFUwZaXnn+6e1bbJ9IFmD+2J7pLP3eNNwa0J+Pn172+U9ZZfPzXvW/jD9GfvRitucLnzNouHfBBH4hWupFIIWDeNnpEd3zZoJmCfckiXh4ZxihSF8ng0QGyFo7xI4M/d9QshpIquM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606899316; h=Content-Type:Content-Transfer-Encoding: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=Z41wdtVrX1P7TMOdXTQDHU5/w3QF676y8J6+L1l1EKA=; b=hrmFZQUoRIEksUwGg4SEKxo+bVIMPdH1KYKqAzEiUg7IxGYOs14l6bnGoo+8VdLqGd6teCk2EIOPt78w395ZcdAguaBJ56OFLRsmtUNUOlZw8xPkVuCFFCPb7KIRWwFJMwDk/TLeaFOXFhpojwpUDrW/9yS8s1tA7QyJ3GM+mX0= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606899316462756.4274866271272; Wed, 2 Dec 2020 00:55:16 -0800 (PST) Received: from localhost ([::1]:55652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkNut-0007VQ-6S for importer@patchew.org; Wed, 02 Dec 2020 03:55:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNCa-00033Q-U3 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCI-0003hY-7K for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:28 -0500 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-580-FT1K1tMbOOyviO8RK3ERlA-1; Wed, 02 Dec 2020 03:09:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB9AD185E486 for ; Wed, 2 Dec 2020 08:09:06 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE8331346F for ; Wed, 2 Dec 2020 08:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z41wdtVrX1P7TMOdXTQDHU5/w3QF676y8J6+L1l1EKA=; b=CguvsmgpcmCEuWA5Qv0n+/oCIHOcIgaNUC2lFONMfEkFhhREKWET9RHzDIxa3z8nwrfaiH ZN1AXPkq63k5ig6zgkWHnO+yB5VXurIUdOR2UsvXzSunAndv887JkhVOTgcgeEFOFpnoDH 9aE8UC9yBjQcW8lax9LVZJi0ISkQTkQ= X-MC-Unique: FT1K1tMbOOyviO8RK3ERlA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 046/113] riscv: do not use ram_size global Date: Wed, 2 Dec 2020 03:07:42 -0500 Message-Id: <20201202080849.4125477-47-pbonzini@redhat.com> In-Reply-To: <20201202080849.4125477-1-pbonzini@redhat.com> References: <20201202080849.4125477-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, 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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use the machine properties instead. Cc: Alistair Francis Signed-off-by: Paolo Bonzini --- hw/riscv/boot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 9b3fe3fb1e..70a9bf8f5d 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -120,7 +120,8 @@ target_ulong riscv_load_firmware(const char *firmware_f= ilename, } =20 firmware_size =3D load_image_targphys_as(firmware_filename, - firmware_load_addr, ram_size, N= ULL); + firmware_load_addr, + current_machine->ram_size, NULL= ); =20 if (firmware_size > 0) { return firmware_load_addr + firmware_size; @@ -148,7 +149,7 @@ target_ulong riscv_load_kernel(const char *kernel_filen= ame, } =20 if (load_image_targphys_as(kernel_filename, kernel_start_addr, - ram_size, NULL) > 0) { + current_machine->ram_size, NULL) > 0) { return kernel_start_addr; } =20 --=20 2.26.2