From nobody Sun Nov 9 16:04:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551159322634915.3828578252921; Mon, 25 Feb 2019 21:35:22 -0800 (PST) Received: from localhost ([127.0.0.1]:49620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyVOh-0003fv-JE for importer@patchew.org; Tue, 26 Feb 2019 00:35:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUlP-0005Zs-72 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyUlN-0002zT-AX for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:43 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:44875) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyUlL-0002uI-Gl; Mon, 25 Feb 2019 23:54:41 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 447mfP6n1Fz9sP4; Tue, 26 Feb 2019 15:53:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1551156797; bh=OLW6SIXS1fDTiGhx1dT2EjLQMoFFUDyTGUaI9vh77sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L6EIsjQ+1+Q/DevQURUfOXPVB7KG5kWDJI+vitPbBzMOEhyXnGReJz3MaZx7tnP7s HmDLTqswQaVTHydLv78WlOgJwJ3OkCKYletw0LFeLkx7tuZ2AEq/ruXuF94Kiuersi uwGTa1rovXUHRhGRJNcwGpR/k/7YAaPhdR6PE6H4= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 26 Feb 2019 15:53:03 +1100 Message-Id: <20190226045304.25618-50-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226045304.25618-1-david@gibson.dropbear.id.au> References: <20190226045304.25618-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 49/50] ppc/pnv: add INITRD_MAX_SIZE constant X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, gkurz@kaod.org, qemu-devel@nongnu.org, Murilo Opsfelder Araujo , qemu-ppc@nongnu.org, clg@kaod.org, Murilo Opsfelder Araujo , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Murilo Opsfelder Araujo The current 0x10000000 value is actually 256MiB, not 128MB as the comment suggests. Move it to a constant and fix the comment (no change in the size value). Signed-off-by: Murilo Opsfelder Araujo Message-Id: <20190225170155.1972-3-muriloo@linux.ibm.com> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/ppc/pnv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 4144976aec..0cd6af4669 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -56,6 +56,7 @@ #define KERNEL_LOAD_ADDR 0x20000000 #define KERNEL_MAX_SIZE (256 * MiB) #define INITRD_LOAD_ADDR 0x60000000 +#define INITRD_MAX_SIZE (256 * MiB) =20 static const char *pnv_chip_core_typename(const PnvChip *o) { @@ -601,7 +602,7 @@ static void pnv_init(MachineState *machine) if (machine->initrd_filename) { pnv->initrd_base =3D INITRD_LOAD_ADDR; pnv->initrd_size =3D load_image_targphys(machine->initrd_filename, - pnv->initrd_base, 0x10000000); /* 128MB = max */ + pnv->initrd_base, INITRD_MAX_SIZE); if (pnv->initrd_size < 0) { error_report("Could not load initial ram disk '%s'", machine->initrd_filename); --=20 2.20.1