Commit e1888295 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

virtio-gpu: update console device property. 



Update the device link of the QemuConsole, so it points to the
virtio-gpu-pci or virtio-vga device instead of virtio-gpu-device.

This is needed because we want to find the device by id, for
example for input routing, and the id specified on the command
line is attached to the pci proxy, not the virtio device.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 5317b0f6

hw/display/virtio-gpu-pci.c

+8 −0
Original line number Diff line number Diff line
@@ -25,13 +25,21 @@ static Property virtio_gpu_pci_properties[] = { 
static void virtio_gpu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    VirtIOGPUPCI *vgpu = VIRTIO_GPU_PCI(vpci_dev);

    VirtIOGPU *g = &vgpu->vdev;

    DeviceState *vdev = DEVICE(&vgpu->vdev);

    int i;



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    /* force virtio-1.0 */

    vpci_dev->flags &= ~VIRTIO_PCI_FLAG_DISABLE_MODERN;

    vpci_dev->flags |= VIRTIO_PCI_FLAG_DISABLE_LEGACY;

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);



    for (i = 0; i < g->conf.max_outputs; i++) {

        object_property_set_link(OBJECT(g->scanout[i].con),

                                 OBJECT(vpci_dev),

                                 "device", errp);

    }

}



static void virtio_gpu_pci_class_init(ObjectClass *klass, void *data)

hw/display/virtio-vga.c

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    VirtIOGPU *g = &vvga->vdev;

    VGACommonState *vga = &vvga->vga;

    uint32_t offset;

    int i;



    /* init vga compat bits */

    vga->vram_size_mb = 8;
@@ -120,6 +121,12 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 


    vga->con = g->scanout[0].con;

    graphic_console_set_hwops(vga->con, &virtio_vga_ops, vvga);



    for (i = 0; i < g->conf.max_outputs; i++) {

        object_property_set_link(OBJECT(g->scanout[i].con),

                                 OBJECT(vpci_dev),

                                 "device", errp);

    }

}



static void virtio_vga_reset(DeviceState *dev)