2726dc51e0
The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. virtio_gpu_pci_base_realize(), virtio_vga_base_realize(), sparc32_ledma_device_realize(), sparc32_dma_realize(), sparc32_dma_realize() xilinx_axidma_realize(), mips_cps_realize(), macio_realize_ide(), xilinx_enet_realize(), and virtio_iommu_pci_realize() are wrong that way: they reuse the argument they pass to object_property_set_link() for another call. Harmless, because object_property_set_link() can't actually fail for them: it fails when the property doesn't exist, is not settable, or its .check() method fails. Fix by passing &error_abort instead. Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com> Cc: Alistair Francis <alistair@alistair23.me> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-arm@nongnu.org Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> Cc: Eric Auger <eric.auger@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20200630090351.1247703-16-armbru@redhat.com> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
104 lines
2.9 KiB
C
104 lines
2.9 KiB
C
/*
|
|
* Virtio video device
|
|
*
|
|
* Copyright Red Hat
|
|
*
|
|
* Authors:
|
|
* Dave Airlie
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/virtio/virtio.h"
|
|
#include "hw/virtio/virtio-bus.h"
|
|
#include "hw/virtio/virtio-gpu-pci.h"
|
|
|
|
static Property virtio_gpu_pci_base_properties[] = {
|
|
DEFINE_VIRTIO_GPU_PCI_PROPERTIES(VirtIOPCIProxy),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
{
|
|
VirtIOGPUPCIBase *vgpu = VIRTIO_GPU_PCI_BASE(vpci_dev);
|
|
VirtIOGPUBase *g = vgpu->vgpu;
|
|
DeviceState *vdev = DEVICE(g);
|
|
int i;
|
|
Error *local_error = NULL;
|
|
|
|
virtio_pci_force_virtio_1(vpci_dev);
|
|
qdev_realize(vdev, BUS(&vpci_dev->bus), &local_error);
|
|
|
|
if (local_error) {
|
|
error_propagate(errp, local_error);
|
|
return;
|
|
}
|
|
|
|
for (i = 0; i < g->conf.max_outputs; i++) {
|
|
object_property_set_link(OBJECT(g->scanout[i].con),
|
|
OBJECT(vpci_dev),
|
|
"device", &error_abort);
|
|
}
|
|
}
|
|
|
|
static void virtio_gpu_pci_base_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
|
|
|
|
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
|
|
device_class_set_props(dc, virtio_gpu_pci_base_properties);
|
|
dc->hotpluggable = false;
|
|
k->realize = virtio_gpu_pci_base_realize;
|
|
pcidev_k->class_id = PCI_CLASS_DISPLAY_OTHER;
|
|
}
|
|
|
|
static const TypeInfo virtio_gpu_pci_base_info = {
|
|
.name = TYPE_VIRTIO_GPU_PCI_BASE,
|
|
.parent = TYPE_VIRTIO_PCI,
|
|
.instance_size = sizeof(VirtIOGPUPCIBase),
|
|
.class_init = virtio_gpu_pci_base_class_init,
|
|
.abstract = true
|
|
};
|
|
|
|
#define TYPE_VIRTIO_GPU_PCI "virtio-gpu-pci"
|
|
#define VIRTIO_GPU_PCI(obj) \
|
|
OBJECT_CHECK(VirtIOGPUPCI, (obj), TYPE_VIRTIO_GPU_PCI)
|
|
|
|
typedef struct VirtIOGPUPCI {
|
|
VirtIOGPUPCIBase parent_obj;
|
|
VirtIOGPU vdev;
|
|
} VirtIOGPUPCI;
|
|
|
|
static void virtio_gpu_initfn(Object *obj)
|
|
{
|
|
VirtIOGPUPCI *dev = VIRTIO_GPU_PCI(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_GPU);
|
|
VIRTIO_GPU_PCI_BASE(obj)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
|
|
}
|
|
|
|
static const VirtioPCIDeviceTypeInfo virtio_gpu_pci_info = {
|
|
.generic_name = TYPE_VIRTIO_GPU_PCI,
|
|
.parent = TYPE_VIRTIO_GPU_PCI_BASE,
|
|
.instance_size = sizeof(VirtIOGPUPCI),
|
|
.instance_init = virtio_gpu_initfn,
|
|
};
|
|
|
|
static void virtio_gpu_pci_register_types(void)
|
|
{
|
|
type_register_static(&virtio_gpu_pci_base_info);
|
|
virtio_pci_types_register(&virtio_gpu_pci_info);
|
|
}
|
|
|
|
type_init(virtio_gpu_pci_register_types)
|