Commit cf4e3d00 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

virtio: Drop broken and superfluous object_property_set_link() 



virtio_crypto_pci_realize() and copies the value of vcrypto->vdev's
property "cryptodev" to vcrypto's property:

    object_property_set_link(OBJECT(vrng), "rng", OBJECT(vrng->vdev.conf.rng),
                             NULL);

Since it does so only after realize, this always fails, but the error
is ignored.

It's actually superfluous: vcrypto's property is an alias of
vcrypto->vdev's property, created by virtio_instance_init_common().

Drop the call.

Same for virtio_ccw_crypto_realize(), virtio_rng_pci_realize(),
virtio_ccw_rng_realize().

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200721121153.1128844-1-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent dba04c34

hw/s390x/virtio-ccw-crypto.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&ccw_dev->bus), errp)) {

        return;

    }



    object_property_set_link(OBJECT(vdev), "cryptodev",

                             OBJECT(dev->vdev.conf.cryptodev), NULL);

}



static void virtio_ccw_crypto_instance_init(Object *obj)

hw/s390x/virtio-ccw-rng.c

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&ccw_dev->bus), errp)) {

        return;

    }



    object_property_set_link(OBJECT(dev), "rng", OBJECT(dev->vdev.conf.rng),

                             NULL);

}



static void virtio_ccw_rng_instance_init(Object *obj)

hw/virtio/virtio-crypto-pci.c

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {

        return;

    }

    object_property_set_link(OBJECT(vcrypto), "cryptodev",

                             OBJECT(vcrypto->vdev.conf.cryptodev), NULL);

}



static void virtio_crypto_pci_class_init(ObjectClass *klass, void *data)

hw/virtio/virtio-rng-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {

        return;

    }



    object_property_set_link(OBJECT(vrng), "rng", OBJECT(vrng->vdev.conf.rng),

                             NULL);

}



static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)