| Message ID | 20200628142429.17111-8-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spitz: fix hacks, fix CID 1421913, various cleanups | expand |
On 6/28/20 4:24 PM, Peter Maydell wrote: > The max111x is a proper qdev device; we can use dc->vmsd rather than > directly calling vmstate_register(). > > It's possible that this is a migration compat break, but the only > boards that use this device are the spitz-family ('akita', 'borzoi', > 'spitz', 'terrier'). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/misc/max111x.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c > index d0e5534e4f5..abddfa3c660 100644 > --- a/hw/misc/max111x.c > +++ b/hw/misc/max111x.c > @@ -140,8 +140,6 @@ static int max111x_init(SSISlave *d, int inputs) > > s->inputs = inputs; > > - vmstate_register(VMSTATE_IF(dev), VMSTATE_INSTANCE_ID_ANY, > - &vmstate_max111x, s); > return 0; > } > > @@ -206,6 +204,7 @@ static void max111x_class_init(ObjectClass *klass, void *data) > > k->transfer = max111x_transfer; > dc->reset = max111x_reset; > + dc->vmsd = &vmstate_max111x; > } > > static const TypeInfo max111x_info = { > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Sun, Jun 28, 2020 at 7:25 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > The max111x is a proper qdev device; we can use dc->vmsd rather than > directly calling vmstate_register(). > > It's possible that this is a migration compat break, but the only > boards that use this device are the spitz-family ('akita', 'borzoi', > 'spitz', 'terrier'). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/misc/max111x.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c > index d0e5534e4f5..abddfa3c660 100644 > --- a/hw/misc/max111x.c > +++ b/hw/misc/max111x.c > @@ -140,8 +140,6 @@ static int max111x_init(SSISlave *d, int inputs) > > s->inputs = inputs; > > - vmstate_register(VMSTATE_IF(dev), VMSTATE_INSTANCE_ID_ANY, > - &vmstate_max111x, s); > return 0; > } > > @@ -206,6 +204,7 @@ static void max111x_class_init(ObjectClass *klass, void *data) > > k->transfer = max111x_transfer; > dc->reset = max111x_reset; > + dc->vmsd = &vmstate_max111x; > } > > static const TypeInfo max111x_info = { > -- > 2.20.1 > >
diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index d0e5534e4f5..abddfa3c660 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -140,8 +140,6 @@ static int max111x_init(SSISlave *d, int inputs) s->inputs = inputs; - vmstate_register(VMSTATE_IF(dev), VMSTATE_INSTANCE_ID_ANY, - &vmstate_max111x, s); return 0; } @@ -206,6 +204,7 @@ static void max111x_class_init(ObjectClass *klass, void *data) k->transfer = max111x_transfer; dc->reset = max111x_reset; + dc->vmsd = &vmstate_max111x; } static const TypeInfo max111x_info = {
The max111x is a proper qdev device; we can use dc->vmsd rather than directly calling vmstate_register(). It's possible that this is a migration compat break, but the only boards that use this device are the spitz-family ('akita', 'borzoi', 'spitz', 'terrier'). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/misc/max111x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.20.1