diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-08-21 13:13:12 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-08-30 12:52:57 +0200 |
| commit | 43e4dbe206df896c9985147e857a08cd0fc01525 (patch) | |
| tree | 5fdad35676bc4df0d13990e4bc07aba5cc429473 /hw/display | |
| parent | 19b599f7664b2ebfd0f405fb79c14dd241557452 (diff) | |
| download | qemu-43e4dbe206df896c9985147e857a08cd0fc01525.zip qemu-43e4dbe206df896c9985147e857a08cd0fc01525.tar.gz qemu-43e4dbe206df896c9985147e857a08cd0fc01525.tar.bz2 | |
virtio-vga: fix reset
We must call the reset functions for both virtio-gpu
and vga to properly reset the combo device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180821111313.27792-2-kraxel@redhat.com
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/virtio-gpu.c | 2 | ||||
| -rw-r--r-- | hw/display/virtio-vga.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 3ddd29c..d6c9b02 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1289,7 +1289,7 @@ static void virtio_gpu_instance_init(Object *obj) { } -static void virtio_gpu_reset(VirtIODevice *vdev) +void virtio_gpu_reset(VirtIODevice *vdev) { VirtIOGPU *g = VIRTIO_GPU(vdev); struct virtio_gpu_simple_resource *res, *tmp; diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 701d980..50c72f2 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -179,8 +179,12 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) static void virtio_vga_reset(DeviceState *dev) { VirtIOVGA *vvga = VIRTIO_VGA(dev); - vvga->vdev.enable = 0; + /* reset virtio-gpu */ + virtio_gpu_reset(VIRTIO_DEVICE(&vvga->vdev)); + + /* reset vga */ + vga_common_reset(&vvga->vga); vga_dirty_log_start(&vvga->vga); } |