cuda: embed mos6522_cuda device directly rather than using QOM object link
commit2e3e5c7e92452900e2bb5143c5fb6d47c0897a34
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Thu, 7 Jun 2018 17:17:49 +0000 (7 18:17 +0100)
committerDavid Gibson <david@gibson.dropbear.id.au>
Tue, 12 Jun 2018 00:44:36 +0000 (12 10:44 +1000)
treedd0c9f3ba9e8ad1abe19710216394ece8677e64c
parent72ee08cf4f2d4443d198b4e9f7a6fa2beb06dd6b
cuda: embed mos6522_cuda device directly rather than using QOM object link

Examining the migration stream it can be seen that the mos6522 device state is
being stored separately rather than as part of the CUDA device which is
incorrect (and likely to cause issues if another mos6522 device is added to
the machine).

Resolve this by embedding the mos6522_cuda device directly within the CUDA
device rather than using a QOM object link to reference the device separately.

Note that we also bump the version in vmstate_cuda to reflect this change: this
isn't particularly important for the moment as the Mac machine migration isn't
100% reliable due to issues migrating the timebase under TCG.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
hw/misc/macio/cuda.c
hw/misc/mos6522.c
include/hw/misc/macio/cuda.h
include/hw/misc/mos6522.h