From patchwork Mon Feb 25 14:24:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Murilo_Opsfelder_Ara=C3=BAjo?= X-Patchwork-Id: 10828679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A8241399 for ; Mon, 25 Feb 2019 14:59:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 698A92A7D0 for ; Mon, 25 Feb 2019 14:59:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DC422AF3E; Mon, 25 Feb 2019 14:59:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32D942A7D0 for ; Mon, 25 Feb 2019 14:59:23 +0000 (UTC) Received: from localhost ([127.0.0.1]:38666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyHj0-0006kL-DQ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Feb 2019 09:59:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyHBT-0006Id-RV for qemu-devel@nongnu.org; Mon, 25 Feb 2019 09:24:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyHBT-0001Mi-6F for qemu-devel@nongnu.org; Mon, 25 Feb 2019 09:24:43 -0500 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:38456) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyHBT-0001MM-1t; Mon, 25 Feb 2019 09:24:43 -0500 Received: by mail-qt1-x841.google.com with SMTP id s1so10632396qte.5; Mon, 25 Feb 2019 06:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tqUd36gZTaeFrnsX+Fs51UQqBZqbb2gcYx2l7gwLF8M=; b=C8rb3BRU++0sO96mdudulpgG+0PFHWyepIG0L/0V6d43536giAtyR9rzvL15P3ICbG CZajKmt+E/eJcqrqyx4vDQdFBSWwm2eeBkIgPLt3OeWy3POLXxrPBw/xlkzMZkN5F5dd uWGlANTr1BR9BKQeXCSL4I3ELtXXY/O2rxNka0wKEobZB6I+h6M30Y37CGOd8KuAgwxF e6iRo/YtNnBKXq3X5lhI51awmIH8tC41ryQnwdxI6Q52ZDr/e8+jA2caRlITraXFflDq 9P/hBxJ9F9wHm4jf/VSnZuTsUky5nO24i9IDer6AzSJldEmDq1MWQXKqTT1Bq5mCj8eI 4V+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tqUd36gZTaeFrnsX+Fs51UQqBZqbb2gcYx2l7gwLF8M=; b=UE7v7C5QsIKogg1taHqGwwTGFliBmpbFvJ7sfjnaNCIryEox9nMad6N2T83SZIaBPa /sI5KAnvopQN0y0rlfU3i10aECGGp9QlfGzcZTojkm3TYw8KKLQZWFckA2Mz/sTji33t 8LgJTMLC7EoXpSv1sJ26hQwcxpHomxGowKoUcZA/U6GRYLGZZDYIMt/xJURh66TD6iNJ 8Eu+AdIlWwQBHk4zfIrJjb9zCRgTMOFESKYAzg/fMUheqIWSQ53euNUiGgnhAAdh/C8N yp+Kk9mLCaoQ7Z1lVa5NwtzSYH8xbHgGPoMQrdXZHK6ZIiTpkko0L6fCMbNS12J+F3ky JOfA== X-Gm-Message-State: AHQUAuaA7xj+JQanQNXLYtp3BWcHksFV5CWeVH8Wkb3TGTiIyv+l9MyS eCUbhtg7BrVQoxO57G+P1h4c9uYZ X-Google-Smtp-Source: AHgI3IY7cxFQoKSxzFurQZTzpK6k8k+dqr8JkL67qrGEy5KHU7itaIRostCnpTHl1Vf+1FoWjdl3Uw== X-Received: by 2002:a0c:c584:: with SMTP id a4mr13728517qvj.227.1551104682075; Mon, 25 Feb 2019 06:24:42 -0800 (PST) Received: from kermit.br.ibm.com.com ([189.79.172.7]) by smtp.gmail.com with ESMTPSA id e4sm4268390qta.84.2019.02.25.06.24.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Feb 2019 06:24:41 -0800 (PST) From: Murilo Opsfelder Araujo X-Google-Original-From: Murilo Opsfelder Araujo To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2019 11:24:07 -0300 Message-Id: <20190225142407.9477-3-muriloo@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225142407.9477-1-muriloo@linux.ibm.com> References: <20190225142407.9477-1-muriloo@linux.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 X-Mailman-Approved-At: Mon, 25 Feb 2019 09:58:08 -0500 Subject: [Qemu-devel] [PATCH 2/2] 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: mopsfelder@gmail.com, David Gibson , qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , Murilo Opsfelder Araujo Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 000707164e..514439db20 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -56,6 +56,7 @@ #define KERNEL_LOAD_ADDR 0x20000000 #define KERNEL_MAX_SIZE 0x10000000 /* 256MiB */ #define INITRD_LOAD_ADDR 0x60000000 +#define INITRD_MAX_SIZE 0x10000000 /* 256MiB */ 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 = INITRD_LOAD_ADDR; pnv->initrd_size = 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);