From nobody Tue Feb 10 01:34:54 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=1606898958; cv=none; d=zohomail.com; s=zohoarc; b=hii1gbxYXdz8q0y+f+G+suAONEESonmcAbbuhSxVbB131kxAqpKk9uPgGW0Zon+y0riKWj/nxwqJeqvIzkn9A3tWGGcUkCGAzEChVO9UBOkxYIzwg+swbnvYegbr24N+4m7+s6/OS2grgpxfaKQ/H5/JqBsqtADtQTXFXl3Kj+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606898958; 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=8E+/Fiz3NqLS9yQanr0Zg453gPRiB9OY5V3QQ3GVy70=; b=jJtMdFrhdmGdznBB8uqOcPz3vSN16LV9I+azAuox5FYrT2pizA/YMyqybGcRBYLNjah/8jBeIhCSw3Gdv4FVJ6hB0V6cdpi91O3vvCjF+1uNe1A0Uk0rd8wa0mT7AY6j5AsAgG/17IqL1vhRZq5xPEk0uOLviNeH5a5OedsOqKA= 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 1606898958789267.01861926715924; Wed, 2 Dec 2020 00:49:18 -0800 (PST) Received: from localhost ([::1]:38746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkNp7-0000QK-LA for importer@patchew.org; Wed, 02 Dec 2020 03:49:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNCa-000330-4e for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCG-0003h3-SK for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:27 -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-581-n-MRha-ENx2lQLQkh4zgfg-1; Wed, 02 Dec 2020 03:09:06 -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 A368F185E48B for ; Wed, 2 Dec 2020 08:09:05 +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 708D91346F for ; Wed, 2 Dec 2020 08:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896548; 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=8E+/Fiz3NqLS9yQanr0Zg453gPRiB9OY5V3QQ3GVy70=; b=MkdK34KMHzn5DpY/+qKoOYAZKqO2d9dbG7bgRFtsg5GSW77K5K8kuUACKBbLKG2EbzGjvA 64QFlb31ZfAfXYKJ8gyt3U90SG2ecBvEofPvdKhipKoGfq5wezHNwdtf769UwyEK0+I70s aU2nMiMnxwXodXO7TdUOp/DvLkv1BFU= X-MC-Unique: n-MRha-ENx2lQLQkh4zgfg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 042/113] mips: do not use ram_size global Date: Wed, 2 Dec 2020 03:07:38 -0500 Message-Id: <20201202080849.4125477-43-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-Type: text/plain; charset="utf-8" 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=216.205.24.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_H3=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) Use the machine properties or loader parameters instead. Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/mips/fuloong2e.c | 4 ++-- hw/mips/malta.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 25b679011f..84a2132f85 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -134,14 +134,14 @@ static int64_t load_kernel(CPUMIPSState *env) initrd_size =3D get_image_size(loaderparams.initrd_filename); if (initrd_size > 0) { initrd_offset =3D ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > ram_size) { + if (initrd_offset + initrd_size > loaderparams.ram_size) { error_report("memory too small for initial ram disk '%s'", loaderparams.initrd_filename); exit(1); } initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, initrd_offset, - ram_size - initrd_offset); + loaderparams.ram_size - init= rd_offset); } if (initrd_size =3D=3D (target_ulong) -1) { error_report("could not load initial ram disk '%s'", diff --git a/hw/mips/malta.c b/hw/mips/malta.c index ef369945d1..467b21849e 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1087,7 +1087,7 @@ static int64_t load_kernel(void) } initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, initrd_offset, - ram_size - initrd_offset); + loaderparams.ram_size - init= rd_offset); } if (initrd_size =3D=3D (target_ulong) -1) { error_report("could not load initial ram disk '%s'", --=20 2.26.2