From 2e3e5c7e92452900e2bb5143c5fb6d47c0897a34 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Thu, 7 Jun 2018 18:17:49 +0100 Subject: 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 Signed-off-by: David Gibson --- hw/misc/mos6522.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/misc/mos6522.c') diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index bcb306d357..524a250329 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, -- cgit 1.4.1