Since new machines might be added with different boot order
than 'c', take the machine default one at reset.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/hppa/machine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index dacedc5409c..1cce5c47b91 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -640,6 +640,7 @@ static void machine_HP_C3700_init(MachineState *machine)
 
 static void hppa_machine_reset(MachineState *ms, ResetType type)
 {
+    MachineClass *mc = MACHINE_GET_CLASS(ms);
     unsigned int smp_cpus = ms->smp.cpus;
     int i;
 
@@ -671,7 +672,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 = 'c';
+    cpu[0]->env.cmdline_or_bootorder = mc->default_boot_order[0];
 }
 
 static void hppa_nmi(NMIState *n, int cpu_index, Error **errp)
-- 
2.51.0

On 10/9/25 07:31, Philippe Mathieu-Daudé wrote:
> Since new machines might be added with different boot order
> than 'c', take the machine default one at reset.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/hppa/machine.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index dacedc5409c..1cce5c47b91 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -640,6 +640,7 @@ static void machine_HP_C3700_init(MachineState *machine)
>   
>   static void hppa_machine_reset(MachineState *ms, ResetType type)
>   {
> +    MachineClass *mc = MACHINE_GET_CLASS(ms);
>       unsigned int smp_cpus = ms->smp.cpus;
>       int i;
>   
> @@ -671,7 +672,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 = 'c';
> +    cpu[0]->env.cmdline_or_bootorder = mc->default_boot_order[0];
>   }
>   
>   static void hppa_nmi(NMIState *n, int cpu_index, Error **errp)

Is this perhaps trying to reset boot order to 'c' for reboot?


r~