Re: [Qemu-devel] [PATCH 1/4] target-ppc: add CPU IRQ state to PPC VMStateDescription

[Alexey Kardashevskiy <aik@ozlabs.ru>]

On 01/07/2016 05:22 AM, Mark Cave-Ayland wrote:
> Commit a90db15 "target-ppc: Convert ppc cpu savevm to VMStateDescription"
> appears to drop the internal CPU IRQ state from the migration stream. Whilst
> testing migration on g3beige/mac99 machines, test images would randomly fail to
> resume unless a key was pressed on the VGA console.
>
> Further investigation suggests that internal CPU IRQ state isn't being
> preserved and so interrupts asserted at the time of migration are lost. Adding
> the pending_interrupts and irq_input_state fields back into the migration
> stream appears to fix the problem here during local tests.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>   target-ppc/machine.c |    4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/target-ppc/machine.c b/target-ppc/machine.c
> index f4ac761..98fc63a 100644
> --- a/target-ppc/machine.c
> +++ b/target-ppc/machine.c
> @@ -532,6 +532,10 @@ const VMStateDescription vmstate_ppc_cpu = {
>           VMSTATE_UINTTL(env.hflags_nmsr, PowerPCCPU),
>           /* FIXME: access_type? */
>
> +        /* Interrupt state */
> +        VMSTATE_UINT32(env.pending_interrupts, PowerPCCPU),
> +        VMSTATE_UINT32(env.irq_input_state, PowerPCCPU),
> +

You change the binary stream here so you have to bump a vmstate_ppc_cpu 
version and use VMSTATE_UINT32_V() with this new version number.


>           /* Sanity checking */
>           VMSTATE_UINTTL_EQUAL(env.msr_mask, PowerPCCPU),
>           VMSTATE_UINT64_EQUAL(env.insns_flags, PowerPCCPU),
>



-- 
Alexey