From patchwork Mon Oct 3 20:13:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 12997787 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DBB3C433FE for ; Mon, 3 Oct 2022 21:04:05 +0000 (UTC) Received: from localhost ([::1]:35524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofSbb-0006SA-6j for qemu-devel@archiver.kernel.org; Mon, 03 Oct 2022 17:04:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofRok-00055o-RK; Mon, 03 Oct 2022 16:13:42 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:20454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofRoh-00010H-S7; Mon, 03 Oct 2022 16:13:34 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 439EC75A156; Mon, 3 Oct 2022 22:13:19 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 24FE5746324; Mon, 3 Oct 2022 22:13:19 +0200 (CEST) Message-Id: <2514e45b2ac438e40180cdf51e156a9dcf6a4df4.1664827008.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v3 05/13] mac_{old|new}world: Simplify cmdline_base calculation To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Mon, 3 Oct 2022 22:13:19 +0200 (CEST) Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" By slight reorganisation we can avoid an else branch and some code duplication which makes it easier to follow the code. Signed-off-by: BALATON Zoltan --- hw/ppc/mac_newworld.c | 6 +++--- hw/ppc/mac_oldworld.c | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 6bc3bd19be..73b01e8c6d 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -194,9 +194,11 @@ static void ppc_core99_init(MachineState *machine) machine->kernel_filename); exit(1); } + cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + + KERNEL_GAP); /* load initrd */ if (machine->initrd_filename) { - initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + KERNEL_GAP); + initrd_base = cmdline_base; initrd_size = load_image_targphys(machine->initrd_filename, initrd_base, machine->ram_size - initrd_base); @@ -206,8 +208,6 @@ static void ppc_core99_init(MachineState *machine) exit(1); } cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size); - } else { - cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + KERNEL_GAP); } ppc_boot_device = 'm'; } else { diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index cb67e44081..b424729a39 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -168,10 +168,11 @@ static void ppc_heathrow_init(MachineState *machine) machine->kernel_filename); exit(1); } + cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + + KERNEL_GAP); /* load initrd */ if (machine->initrd_filename) { - initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + - KERNEL_GAP); + initrd_base = cmdline_base; initrd_size = load_image_targphys(machine->initrd_filename, initrd_base, machine->ram_size - initrd_base); @@ -181,8 +182,6 @@ static void ppc_heathrow_init(MachineState *machine) exit(1); } cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size); - } else { - cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + KERNEL_GAP); } ppc_boot_device = 'm'; } else {