diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2021-06-25 17:35:54 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-07-02 17:35:08 +0200 |
| commit | 8660df5ea25ea4e6ee94fca43559165fe7610199 (patch) | |
| tree | 60dde782dfc37853bc983566fcbb20213c8bda2c /hw/display | |
| parent | d5bfbaca39e9a700cabf4266247c93edeaf846de (diff) | |
| download | qemu-8660df5ea25ea4e6ee94fca43559165fe7610199.zip qemu-8660df5ea25ea4e6ee94fca43559165fe7610199.tar.gz qemu-8660df5ea25ea4e6ee94fca43559165fe7610199.tar.bz2 | |
g364fb: add VMStateDescription for G364SysBusState
Currently when QEMU attempts to migrate the MIPS magnum machine it crashes due
to a mistake in the g364fb VMStateDescription configuration which expects a
G364SysBusState and not a G364State.
Resolve the issue by adding a new VMStateDescription for G364SysBusState and
embedding the existing vmstate_g364fb VMStateDescription inside it using
VMSTATE_STRUCT.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 97a3f6ffbba ("g364fb: convert to qdev")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210625163554.14879-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/g364fb.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 87effbf..caca86d 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -517,6 +517,16 @@ static Property g364fb_sysbus_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static const VMStateDescription vmstate_g364fb_sysbus = { + .name = "g364fb-sysbus", + .version_id = 2, + .minimum_version_id = 2, + .fields = (VMStateField[]) { + VMSTATE_STRUCT(g364, G364SysBusState, 2, vmstate_g364fb, G364State), + VMSTATE_END_OF_LIST() + } +}; + static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -525,7 +535,7 @@ static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->desc = "G364 framebuffer"; dc->reset = g364fb_sysbus_reset; - dc->vmsd = &vmstate_g364fb; + dc->vmsd = &vmstate_g364fb_sysbus; device_class_set_props(dc, g364fb_sysbus_properties); } |