Commit dd56040d authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs" 



This reverts commit f2784eed
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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190729162903.4489-3-dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 92fd453c

hw/core/machine.c

+3 −20
Original line number Diff line number Diff line
@@ -115,26 +115,9 @@ const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); 


GlobalProperty hw_compat_2_6[] = {

    { "virtio-mmio", "format_transport_address", "off" },

    /*

     * don't include devices which are modern-only

     * ie keyboard, mouse, tablet, gpu, vga & crypto

     */

    { "virtio-9p-pci", "disable-modern", "on" },

    { "virtio-9p-pci", "disable-legacy", "off" },

    { "virtio-balloon-pci", "disable-modern", "on" },

    { "virtio-balloon-pci", "disable-legacy", "off" },

    { "virtio-blk-pci", "disable-modern", "on" },

    { "virtio-blk-pci", "disable-legacy", "off" },

    { "virtio-input-host-pci", "disable-modern", "on" },

    { "virtio-input-host-pci", "disable-legacy", "off" },

    { "virtio-net-pci", "disable-modern", "on" },

    { "virtio-net-pci", "disable-legacy", "off" },

    { "virtio-rng-pci", "disable-modern", "on" },

    { "virtio-rng-pci", "disable-legacy", "off" },

    { "virtio-scsi-pci", "disable-modern", "on" },

    { "virtio-scsi-pci", "disable-legacy", "off" },

    { "virtio-serial-pci", "disable-modern", "on" },

    { "virtio-serial-pci", "disable-legacy", "off" },

    /* Optional because not all virtio-pci devices support legacy mode */

    { "virtio-pci", "disable-modern", "on",  .optional = true },

    { "virtio-pci", "disable-legacy", "off", .optional = true },

};

const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);

hw/display/virtio-gpu-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {

hw/display/virtio-vga.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

hw/virtio/virtio-crypto-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    }



    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", errp);

    object_property_set_link(OBJECT(vcrypto),

                 OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev",

hw/virtio/virtio-input-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ static void virtio_input_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    DeviceState *vdev = DEVICE(&vinput->vdev);



    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", errp);

}