[Qemu-devel] [PATCH] hw/arm/strongarm: Wire up missing GPIO and PPC vmstate

[Qemu-devel] [PATCH] hw/arm/strongarm: Wire up missing GPIO and PPC vmstate

[Peter Maydell]

The VMStateDescription structs for the GPIO and PPC devices were
accidentally never wired up. Add missing state fields and register
them via dc->vmsd.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/strongarm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 0da9015..5ad8fd4 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -675,7 +675,9 @@ static const VMStateDescription vmstate_strongarm_gpio_regs = {
         VMSTATE_UINT32(rising, StrongARMGPIOInfo),
         VMSTATE_UINT32(falling, StrongARMGPIOInfo),
         VMSTATE_UINT32(status, StrongARMGPIOInfo),
+        VMSTATE_UINT32(gpsr, StrongARMGPIOInfo),
         VMSTATE_UINT32(gafr, StrongARMGPIOInfo),
+        VMSTATE_UINT32(prev_level, StrongARMGPIOInfo),
         VMSTATE_END_OF_LIST(),
     },
 };
@@ -687,6 +689,7 @@ static void strongarm_gpio_class_init(ObjectClass *klass, void *data)
 
     k->init = strongarm_gpio_initfn;
     dc->desc = "StrongARM GPIO controller";
+    dc->vmsd = vmstate_strongarm_gpio_regs;
 }
 
 static const TypeInfo strongarm_gpio_info = {
@@ -846,6 +849,7 @@ static const VMStateDescription vmstate_strongarm_ppc_regs = {
         VMSTATE_UINT32(ppar, StrongARMPPCInfo),
         VMSTATE_UINT32(psdr, StrongARMPPCInfo),
         VMSTATE_UINT32(ppfr, StrongARMPPCInfo),
+        VMSTATE_UINT32(prev_level, StrongARMPPCInfo),
         VMSTATE_END_OF_LIST(),
     },
 };
@@ -857,6 +861,7 @@ static void strongarm_ppc_class_init(ObjectClass *klass, void *data)
 
     k->init = strongarm_ppc_init;
     dc->desc = "StrongARM PPC controller";
+    dc->vmsd = vmstate_strongarm_ppc_regs;
 }
 
 static const TypeInfo strongarm_ppc_info = {
-- 
1.9.2

Re: [Qemu-devel] [PATCH] hw/arm/strongarm: Wire up missing GPIO and PPC vmstate

[Peter Maydell]

On 3 June 2014 19:29, Peter Maydell <peter.maydell@linaro.org> wrote:
> The VMStateDescription structs for the GPIO and PPC devices were
> accidentally never wired up. Add missing state fields and register
> them via dc->vmsd.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

This patch has missing '&' syndrome too. I must have
compiled the wrong build tree or something...

-- PMM