From dd56040d297a0c530e204e9f459b256e3ddd7e8f Mon Sep 17 00:00:00 2001 From: Dr. David Alan Gilbert Date: Mon, 29 Jul 2019 17:29:03 +0100 Subject: 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 Message-Id: <20190729162903.4489-3-dgilbert@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrangé Reviewed-by: Cornelia Huck --- hw/display/virtio-vga.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/display/virtio-vga.c') diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 416e7fec87..79a145e284 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); -- cgit v1.2.3-55-g7522