Commit d0f0c865 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

virtio-vga: propagate on gpu realized error 



Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1463653560-26958-3-git-send-email-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent fe89fdeb

hw/display/virtio-gpu-3d.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "trace.h"

#include "hw/virtio/virtio.h"

#include "hw/virtio/virtio-gpu.h"

#include "qapi/error.h"



#ifdef CONFIG_VIRGL

hw/display/virtio-vga.c

+7 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "ui/console.h"

#include "vga_int.h"

#include "hw/virtio/virtio-pci.h"

#include "qapi/error.h"



/*

 * virtio-vga: This extends VirtioPCIProxy.
@@ -89,6 +90,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    VirtIOVGA *vvga = VIRTIO_VGA(vpci_dev);

    VirtIOGPU *g = &vvga->vdev;

    VGACommonState *vga = &vvga->vga;

    Error *err = NULL;

    uint32_t offset;

    int i;
@@ -124,7 +126,11 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    /* 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(g), true, "realized", errp);

    object_property_set_bool(OBJECT(g), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    /* add stdvga mmio regions */

    pci_std_vga_mmio_region_init(vga, &vpci_dev->modern_bar,