Commit aeb72188 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150707-1' into staging 



virtio-gpu property fixes, add testcase

# gpg: Signature made Tue Jul  7 10:24:16 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vga-20150707-1:
  virtio-gpu: add to display-vga test
  virtio-gpu: use virtio_instance_init_common, fixup properties
  virtio-gpu: update console device property.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 14526738 501eea4f

hw/display/virtio-gpu-pci.c

+11 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "hw/virtio/virtio-gpu.h"



static Property virtio_gpu_pci_properties[] = {

    DEFINE_VIRTIO_GPU_PROPERTIES(VirtIOGPUPCI, vdev.conf),

    DEFINE_VIRTIO_GPU_PCI_PROPERTIES(VirtIOPCIProxy),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -25,13 +24,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)
@@ -49,8 +56,9 @@ static void virtio_gpu_pci_class_init(ObjectClass *klass, void *data) 
static void virtio_gpu_initfn(Object *obj)

{

    VirtIOGPUPCI *dev = VIRTIO_GPU_PCI(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_GPU);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_GPU);

}



static const TypeInfo virtio_gpu_pci_info = {

hw/display/virtio-gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void virtio_gpu_reset(VirtIODevice *vdev) 
}



static Property virtio_gpu_properties[] = {

    DEFINE_VIRTIO_GPU_PROPERTIES(VirtIOGPU, conf),

    DEFINE_PROP_UINT32("max_outputs", VirtIOGPU, conf.max_outputs, 1),

    DEFINE_PROP_END_OF_LIST(),

};

hw/display/virtio-vga.c

+10 −3
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)
@@ -131,7 +138,6 @@ static void virtio_vga_reset(DeviceState *dev) 
}



static Property virtio_vga_properties[] = {

    DEFINE_VIRTIO_GPU_PROPERTIES(VirtIOVGA, vdev.conf),

    DEFINE_VIRTIO_GPU_PCI_PROPERTIES(VirtIOPCIProxy),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -155,8 +161,9 @@ static void virtio_vga_class_init(ObjectClass *klass, void *data) 
static void virtio_vga_inst_initfn(Object *obj)

{

    VirtIOVGA *dev = VIRTIO_VGA(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_GPU);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_GPU);

}



static TypeInfo virtio_vga_info = {

include/hw/virtio/virtio-gpu.h

+0 −3
Original line number Diff line number Diff line
@@ -112,9 +112,6 @@ extern const GraphicHwOps virtio_gpu_ops; 
                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false), \

    DEFINE_PROP_UINT32("vectors", _state, nvectors, 3)



#define DEFINE_VIRTIO_GPU_PROPERTIES(_state, _conf_field)               \

    DEFINE_PROP_UINT32("max_outputs", _state, _conf_field.max_outputs, 1)



#define VIRTIO_GPU_FILL_CMD(out) do {                                   \

        size_t s;                                                       \

        s = iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0,          \

tests/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ check-qtest-pci-y += tests/display-vga-test$(EXESUF) 
gcov-files-pci-y += hw/display/vga.c

gcov-files-pci-y += hw/display/cirrus_vga.c

gcov-files-pci-y += hw/display/vga-pci.c

gcov-files-pci-y += hw/display/virtio-gpu.c

gcov-files-pci-y += hw/display/virtio-gpu-pci.c

gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c

check-qtest-pci-y += tests/intel-hda-test$(EXESUF)

gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c