[PATCH] hw/timer: fix a9gtimer vmstate

[PATCH] hw/timer: fix a9gtimer vmstate

[Pavel Dovgalyuk]

A9 gtimer includes global control field and number of per-cpu fields.
But only per-cpu ones are migrated. This patch adds a subsection for
global control field migration.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
---
 hw/timer/a9gtimer.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index 7233068a37..5e959b6d09 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -318,6 +318,12 @@ static void a9_gtimer_realize(DeviceState *dev, Error **errp)
     }
 }
 
+static bool vmstate_a9_gtimer_control_needed(void *opaque)
+{
+    A9GTimerState *s = opaque;
+    return s->control != 0;
+}
+
 static const VMStateDescription vmstate_a9_gtimer_per_cpu = {
     .name = "arm.cortex-a9-global-timer.percpu",
     .version_id = 1,
@@ -331,6 +337,17 @@ static const VMStateDescription vmstate_a9_gtimer_per_cpu = {
     }
 };
 
+static const VMStateDescription vmstate_a9_gtimer_control = {
+    .name = "arm.cortex-a9-global-timer.control",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .needed = vmstate_a9_gtimer_control_needed,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT32(control, A9GTimerState),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static const VMStateDescription vmstate_a9_gtimer = {
     .name = "arm.cortex-a9-global-timer",
     .version_id = 1,
@@ -344,6 +361,10 @@ static const VMStateDescription vmstate_a9_gtimer = {
                                      1, vmstate_a9_gtimer_per_cpu,
                                      A9GTimerPerCPU),
         VMSTATE_END_OF_LIST()
+    },
+    .subsections = (const VMStateDescription*[]) {
+        &vmstate_a9_gtimer_control,
+        NULL
     }
 };
 

Re: [PATCH] hw/timer: fix a9gtimer vmstate

[Pavel Dovgalyuk]

ping

On 07.02.2022 11:44, Pavel Dovgalyuk wrote:
> A9 gtimer includes global control field and number of per-cpu fields.
> But only per-cpu ones are migrated. This patch adds a subsection for
> global control field migration.
> 
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
>   hw/timer/a9gtimer.c |   21 +++++++++++++++++++++
>   1 file changed, 21 insertions(+)
> 
> diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
> index 7233068a37..5e959b6d09 100644
> --- a/hw/timer/a9gtimer.c
> +++ b/hw/timer/a9gtimer.c
> @@ -318,6 +318,12 @@ static void a9_gtimer_realize(DeviceState *dev, Error **errp)
>       }
>   }
>   
> +static bool vmstate_a9_gtimer_control_needed(void *opaque)
> +{
> +    A9GTimerState *s = opaque;
> +    return s->control != 0;
> +}
> +
>   static const VMStateDescription vmstate_a9_gtimer_per_cpu = {
>       .name = "arm.cortex-a9-global-timer.percpu",
>       .version_id = 1,
> @@ -331,6 +337,17 @@ static const VMStateDescription vmstate_a9_gtimer_per_cpu = {
>       }
>   };
>   
> +static const VMStateDescription vmstate_a9_gtimer_control = {
> +    .name = "arm.cortex-a9-global-timer.control",
> +    .version_id = 1,
> +    .minimum_version_id = 1,
> +    .needed = vmstate_a9_gtimer_control_needed,
> +    .fields = (VMStateField[]) {
> +        VMSTATE_UINT32(control, A9GTimerState),
> +        VMSTATE_END_OF_LIST()
> +    }
> +};
> +
>   static const VMStateDescription vmstate_a9_gtimer = {
>       .name = "arm.cortex-a9-global-timer",
>       .version_id = 1,
> @@ -344,6 +361,10 @@ static const VMStateDescription vmstate_a9_gtimer = {
>                                        1, vmstate_a9_gtimer_per_cpu,
>                                        A9GTimerPerCPU),
>           VMSTATE_END_OF_LIST()
> +    },
> +    .subsections = (const VMStateDescription*[]) {
> +        &vmstate_a9_gtimer_control,
> +        NULL
>       }
>   };
>   
> 

Re: [PATCH] hw/timer: fix a9gtimer vmstate

[Peter Maydell]

On Mon, 14 Feb 2022 at 07:34, Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> wrote:
>
> ping
>
> On 07.02.2022 11:44, Pavel Dovgalyuk wrote:
> > A9 gtimer includes global control field and number of per-cpu fields.
> > But only per-cpu ones are migrated. This patch adds a subsection for
> > global control field migration.
> >
> > Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>

Thanks for the ping, this one fell through the net.


Applied to target-arm.next, thanks.

-- PMM