Commit 43e4dbe2 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180821111313.27792-2-kraxel@redhat.com
parent 19b599f7

hw/display/virtio-gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/display/virtio-vga.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

}

include/hw/virtio/virtio-gpu.h

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ extern const GraphicHwOps virtio_gpu_ops; 
    } while (0)



/* virtio-gpu.c */

void virtio_gpu_reset(VirtIODevice *vdev);

void virtio_gpu_ctrl_response(VirtIOGPU *g,

                              struct virtio_gpu_ctrl_command *cmd,

                              struct virtio_gpu_ctrl_hdr *resp,