]> git.ipfire.org Git - thirdparty/qemu.git/commit
serial: Fix double migration data
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Mon, 30 Mar 2020 16:47:12 +0000 (17:47 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 2 Apr 2020 18:55:45 +0000 (14:55 -0400)
commitf602d047ac21fc10bc325bf12fe61f4f5c4360d4
treefcc079b22965a92897a31ac25e7765af0267d8f4
parentddd31732a7379e056749836ff37ff57718083ddb
serial: Fix double migration data

After c9808d60281 we have both an object representing the serial-isa
device and a separate object representing the underlying common serial
uart.  Both of these have vmsd's associated with them and thus the
migration stream ends up with two copies of the migration data - the
serial-isa includes the vmstate of the core serial.   Besides
being wrong, it breaks backwards migration compatibility.

Fix this by removing the dc->vmsd from the core device, so it only
gets migrated by any parent devices including it.
Add a vmstate_serial_mm so that any device that uses serial_mm_init
rather than creating a device still gets migrated.
(That doesn't fix backwards migration for serial_mm_init users,
but does seem to work forwards for ppce500).

Fixes: c9808d60281 ('serial: realize the serial device')
Buglink: https://bugs.launchpad.net/qemu/+bug/1869426
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200330164712.198282-1-dgilbert@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/char/serial.c