diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2018-06-07 18:17:49 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-06-12 10:44:36 +1000 |
| commit | 2e3e5c7e92452900e2bb5143c5fb6d47c0897a34 (patch) | |
| tree | dd0c9f3ba9e8ad1abe19710216394ece8677e64c /hw/misc/mos6522.c | |
| parent | 72ee08cf4f2d4443d198b4e9f7a6fa2beb06dd6b (diff) | |
| download | qemu-2e3e5c7e92452900e2bb5143c5fb6d47c0897a34.zip qemu-2e3e5c7e92452900e2bb5143c5fb6d47c0897a34.tar.gz qemu-2e3e5c7e92452900e2bb5143c5fb6d47c0897a34.tar.bz2 | |
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>
Diffstat (limited to 'hw/misc/mos6522.c')
| -rw-r--r-- | hw/misc/mos6522.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index bcb306d..524a250 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -390,7 +390,7 @@ static const VMStateDescription vmstate_mos6522_timer = { } }; -static const VMStateDescription vmstate_mos6522 = { +const VMStateDescription vmstate_mos6522 = { .name = "mos6522", .version_id = 0, .minimum_version_id = 0, |