All of lore.kernel.org
 help / color / mirror / Atom feed
From: BALATON Zoltan <balaton@eik.bme.hu>
To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Subject: [PATCH v3 05/13] mac_{old|new}world: Simplify cmdline_base calculation
Date: Mon,  3 Oct 2022 22:13:19 +0200 (CEST)	[thread overview]
Message-ID: <2514e45b2ac438e40180cdf51e156a9dcf6a4df4.1664827008.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1664827008.git.balaton@eik.bme.hu>

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 <balaton@eik.bme.hu>
---
 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 {
-- 
2.30.4



  parent reply	other threads:[~2022-10-03 21:04 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-03 20:13 [PATCH v3 00/13] Misc ppc/mac machines clean up BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 01/13] mac_newworld: Drop some variables BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 02/13] mac_oldworld: Drop some more variables BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 03/13] mac_{old|new}world: Set tbfreq at declaration BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 04/13] mac_{old|new}world: Avoid else branch by setting default value BALATON Zoltan
2022-10-03 20:13 ` BALATON Zoltan [this message]
2022-10-14  8:57   ` [PATCH v3 05/13] mac_{old|new}world: Simplify cmdline_base calculation Mark Cave-Ayland
2022-10-14 11:56     ` BALATON Zoltan
2022-10-14 15:25       ` BALATON Zoltan
2022-10-28  8:54         ` Mark Cave-Ayland
2022-10-28 11:59           ` BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 06/13] mac_newworld: Clean up creation of Uninorth devices BALATON Zoltan
2022-10-14  9:04   ` Mark Cave-Ayland
2022-10-03 20:13 ` [PATCH v3 07/13] mac_{old|new}world: Reduce number of QOM casts BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 08/13] hw/ppc/mac.h: Move newworld specific parts out from shared header BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 09/13] hw/ppc/mac.h: Move macio " BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 10/13] hw/ppc/mac.h: Move grackle-pcihost type declaration out to a header BALATON Zoltan
2022-10-14  9:08   ` Mark Cave-Ayland
2022-10-03 20:13 ` [PATCH v3 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board code BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 12/13] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h BALATON Zoltan
2022-10-03 20:13 ` [PATCH v3 13/13] mac_nvram: Use NVRAM_SIZE constant BALATON Zoltan
2022-10-11 10:22 ` [PATCH v3 00/13] Misc ppc/mac machines clean up BALATON Zoltan
2022-10-18 11:37   ` BALATON Zoltan
2022-10-28  9:03     ` Mark Cave-Ayland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2514e45b2ac438e40180cdf51e156a9dcf6a4df4.1664827008.git.balaton@eik.bme.hu \
    --to=balaton@eik.bme.hu \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.