[PATCH 5/6] hw/hppa: Introduce HppaMachineState::boot_info::kernel structure

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

CPUHPPAState::@cmdline_or_bootorder is now only used in kernel
mode. Move it to HppaMachineState::kernel, and use the 'hwaddr'
type.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/hppa/cpu.h |  1 -
 hw/hppa/machine.c | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index e14f238827b..0aa06f6ebec 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -273,7 +273,6 @@ typedef struct CPUArchState {
     bool is_pa20;
 
     target_ulong kernel_entry; /* Linux kernel was loaded here */
-    target_ulong cmdline_or_bootorder;
     target_ulong initrd_base, initrd_end;
 } CPUHPPAState;
 
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 138cd97efd9..c315d13ea01 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -49,6 +49,9 @@ struct HppaMachineState {
                 char bootorder;
                 bool interactive_mode;
             } firmware;
+            struct {
+                hwaddr cmdline_paddr;
+            } kernel;
         };
     } boot_info;
 };
@@ -495,8 +498,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
         hms->boot_info.is_kernel = true;
 
         if (kernel_cmdline) {
-            cpu[0]->env.cmdline_or_bootorder = 0x4000;
-            pstrcpy_targphys("cmdline", cpu[0]->env.cmdline_or_bootorder,
+            hms->boot_info.kernel.cmdline_paddr = 0x4000;
+            pstrcpy_targphys("cmdline", hms->boot_info.kernel.cmdline_paddr,
                              TARGET_PAGE_SIZE, kernel_cmdline);
         }
 
@@ -687,7 +690,7 @@ static void hppa_machine_reset(MachineState *ms, ResetType type)
                          ? cpu[0]->env.kernel_entry
                          : hms->boot_info.firmware.interactive_mode;
     cpu[0]->env.gr[24] = hms->boot_info.is_kernel
-                         ? cpu[0]->env.cmdline_or_bootorder
+                         ? hms->boot_info.kernel.cmdline_paddr
                          : hms->boot_info.firmware.bootorder;
     cpu[0]->env.gr[23] = cpu[0]->env.initrd_base;
     cpu[0]->env.gr[22] = cpu[0]->env.initrd_end;
@@ -698,7 +701,7 @@ static void hppa_machine_reset(MachineState *ms, ResetType type)
     cpu[0]->env.kernel_entry = 0;
     cpu[0]->env.initrd_base = 0;
     cpu[0]->env.initrd_end = 0;
-    cpu[0]->env.cmdline_or_bootorder = 0;
+    hms->boot_info.kernel.cmdline_paddr = 0;
     hms->boot_info.firmware.bootorder = mc->default_boot_order[0];
 }
 
-- 
2.51.0