diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-08-21 13:13:13 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-08-30 12:52:57 +0200 |
| commit | 161f4c471732d8af9fd43f5818ee41fe1ba5be6e (patch) | |
| tree | 78c76ddf76c1b1ceb24f3fa9c510853d6f2c11b2 /hw/display | |
| parent | 43e4dbe206df896c9985147e857a08cd0fc01525 (diff) | |
| download | qemu-161f4c471732d8af9fd43f5818ee41fe1ba5be6e.zip qemu-161f4c471732d8af9fd43f5818ee41fe1ba5be6e.tar.gz qemu-161f4c471732d8af9fd43f5818ee41fe1ba5be6e.tar.bz2 | |
Revert "virtio-gpu: fix crashes upon warm reboot with vga mode"
This reverts commit 93f874fe9dbe0b997b5a9459840957efd13d7191.
Now with virtio-vga being resetted properly the
crash workaround is not needed any more.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180821111313.27792-3-kraxel@redhat.com
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/virtio-gpu.c | 5 | ||||
| -rw-r--r-- | hw/display/virtio-vga.c | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index d6c9b02..1cc9530 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -421,11 +421,6 @@ static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id) scanout->height ?: 480, "Guest disabled display."); } - - if (g->disable_scanout) { - g->disable_scanout(g, scanout_id); - } - dpy_gfx_replace_surface(scanout->con, ds); scanout->resource_id = 0; scanout->ds = NULL; diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 50c72f2..1e601c1 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -75,16 +75,6 @@ static void virtio_vga_gl_block(void *opaque, bool block) } } -static void virtio_vga_disable_scanout(VirtIOGPU *g, int scanout_id) -{ - VirtIOVGA *vvga = container_of(g, VirtIOVGA, vdev); - - if (scanout_id == 0) { - /* reset surface if needed */ - vvga->vga.graphic_mode = -1; - } -} - static const GraphicHwOps virtio_vga_ops = { .invalidate = virtio_vga_invalidate_display, .gfx_update = virtio_vga_update_display, @@ -166,7 +156,6 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vvga->vga_mrs, true); vga->con = g->scanout[0].con; - g->disable_scanout = virtio_vga_disable_scanout; graphic_console_set_hwops(vga->con, &virtio_vga_ops, vvga); for (i = 0; i < g->conf.max_outputs; i++) { |