From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apZNV-0005OO-3D for qemu-devel@nongnu.org; Mon, 11 Apr 2016 06:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apZNM-0001UT-OQ for qemu-devel@nongnu.org; Mon, 11 Apr 2016 06:47:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apZNM-0001Ti-Is for qemu-devel@nongnu.org; Mon, 11 Apr 2016 06:47:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04E7F7F081 for ; Mon, 11 Apr 2016 10:47:22 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 11 Apr 2016 12:47:20 +0200 Message-Id: <1460371640-676-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1460371640-676-1-git-send-email-kraxel@redhat.com> References: <1460371640-676-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/2] virtio-gpu: block live migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" Feeling a bit nervous putting the full live migration support patch (https://patchwork.ozlabs.org/patch/606902/) in that late in the 2.6 devel cycle as it carries some non-trivial changes. So disable migration in case virtio-gpu is present for now. Signed-off-by: Gerd Hoffmann --- hw/display/virtio-gpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 095d7ff..c181fb3 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -917,6 +917,11 @@ const GraphicHwOps virtio_gpu_ops = { .gl_block = virtio_gpu_gl_block, }; +static const VMStateDescription vmstate_virtio_gpu_unmigratable = { + .name = "virtio-gpu", + .unmigratable = 1, +}; + static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(qdev); @@ -968,6 +973,8 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) dpy_gfx_replace_surface(g->scanout[i].con, NULL); } } + + vmstate_register(qdev, -1, &vmstate_virtio_gpu_unmigratable, g); } static void virtio_gpu_instance_init(Object *obj) -- 1.8.3.1