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: Markus Armbruster <[email protected]>
Message-Id: <20200721121153.1128844[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>

diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c
index 570c0333fc88ad054283cef93623e9b8b4284afb..358c74fb4bca223b6c470ffe2d0bd6d117d00a12 100644 (file)
--- a/hw/s390x/virtio-ccw-crypto.c
+++ b/hw/s390x/virtio-ccw-crypto.c
@@ -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;
     }
     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)
 }
 
 static void virtio_ccw_crypto_instance_init(Object *obj)

diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c
index 4bb8c16d797dc4a0a4bf5b2c4159996bf97084c8..2e3a9da5e8beaaa1ca9a25bd9f3a855ef979d8f7 100644 (file)
--- a/hw/s390x/virtio-ccw-rng.c
+++ b/hw/s390x/virtio-ccw-rng.c
@@ -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;
     }
     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)
 }
 
 static void virtio_ccw_rng_instance_init(Object *obj)

diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c
index f1cc979d33bf4e439a693693fa9ccb22d34851fc..198f86e08c5f2a102a340f4d092a6cd89923a19d 100644 (file)
--- a/hw/virtio/virtio-crypto-pci.c
+++ b/hw/virtio/virtio-crypto-pci.c
@@ -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;
     }
     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)
 }
 
 static void virtio_crypto_pci_class_init(ObjectClass *klass, void *data)

diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c
index 2f0b529b62614a2d5f8660c88a507e021633f255..8afbb4c2097e03d236a1e75c17059248c977a768 100644 (file)
--- a/hw/virtio/virtio-rng-pci.c
+++ b/hw/virtio/virtio-rng-pci.c
@@ -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;
     }
     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)
 }
 
 static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)