diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-07-29 17:29:03 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-07-29 16:57:27 -0400 |
| commit | dd56040d297a0c530e204e9f459b256e3ddd7e8f (patch) | |
| tree | 0a4174482e923564cb2b89ea733dab9f15a5c674 /hw/display | |
| parent | 92fd453c6717acbeafcbbac39084a6f1c9ac6827 (diff) | |
| download | qemu-dd56040d297a0c530e204e9f459b256e3ddd7e8f.zip qemu-dd56040d297a0c530e204e9f459b256e3ddd7e8f.tar.gz qemu-dd56040d297a0c530e204e9f459b256e3ddd7e8f.tar.bz2 | |
Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
This reverts commit f2784eed306449c3d04a71a05ed6463b8289aedf
since that accidentally removes the PCIe capabilities from virtio
devices because virtio_pci_dc_realize is called before the new 'mode'
flag is set.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190729162903.4489-3-dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/virtio-gpu-pci.c | 4 | ||||
| -rw-r--r-- | hw/display/virtio-vga.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index d6f01b4..e4c7eb6 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -33,9 +33,7 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) Error *local_error = NULL; qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); - if (!virtio_pci_force_virtio_1(vpci_dev, errp)) { - return; - } + virtio_pci_force_virtio_1(vpci_dev); object_property_set_bool(OBJECT(vdev), true, "realized", &local_error); if (local_error) { diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 416e7fe..79a145e 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -137,9 +137,7 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) /* init virtio bits */ qdev_set_parent_bus(DEVICE(g), BUS(&vpci_dev->bus)); - if (!virtio_pci_force_virtio_1(vpci_dev, errp)) { - return; - } + virtio_pci_force_virtio_1(vpci_dev); object_property_set_bool(OBJECT(g), true, "realized", &err); if (err) { error_propagate(errp, err); |