On Fri, May 05, 2017 at 02:38:08PM -0500, Eric Blake wrote:
> Time to wire up all the call sites that request a shutdown or
> reset to use the enum added in the previous patch.
>
> It would have been less churn to keep the common case with no
> arguments as meaning guest-triggered, and only modified the
> host-triggered code paths, via a wrapper function, but then we'd
> still have to audit that I didn't miss any host-triggered spots;
> changing the signature forces us to double-check that I correctly
> categorized all callers.
>
> Since command line options can change whether a guest reset request
> causes an actual reset vs. a shutdown, it's easy to also add the
> information to reset requests.
>
> Replay adds a FIXME to preserve the cause across the replay stream,
> that will be tackled in the next patch.
>
> Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
> Acked-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> [ppc parts]
> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx> [SPARC part]
[snip]
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 9f18f75..2735fe9 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1166,7 +1166,7 @@ static target_ulong h_client_architecture_support(PowerPCCPU *cpu,
> spapr_ovec_cleanup(ov5_updates);
>
> if (spapr->cas_reboot) {
> - qemu_system_reset_request();
> + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
I'm not 100% sure about this one, since I'm not sure 100% of how the
different enum values are defined. This one is tripped when feature
negotiation between firmware and guest can't be satisfied without
rebooting (next time round the firmware will use some different
options).
So it's essentially a firmware/hypervisor triggered reset, but one
that should only ever be tripped during early guest boot. Is
CAUSE_GUEST_RESET correct for that?
Apart from this, ppc changes
Acked-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
