[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize()
From: |
Markus Armbruster |
Subject: |
[PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() |
Date: |
Wed, 24 Jun 2020 18:43:03 +0200 |
virtio_crypto_pci_realize() continues after realization of its
"virtio-crypto-device" fails. Only an object_property_set_link()
follows; looks harmless to me. Tidy up anyway: return after failure,
just like virtio_rng_pci_realize() does.
Cc: "Gonglei (Arei)" <arei.gonglei@huawei.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/virtio/virtio-crypto-pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c
index 72be531c95..0755722288 100644
--- a/hw/virtio/virtio-crypto-pci.c
+++ b/hw/virtio/virtio-crypto-pci.c
@@ -54,7 +54,9 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy
*vpci_dev, Error **errp)
}
virtio_pci_force_virtio_1(vpci_dev);
- qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
+ if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {
+ return;
+ }
object_property_set_link(OBJECT(vcrypto),
OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev",
NULL);
--
2.26.2
- [PATCH 31/46] qom: Use error_reportf_err() instead of g_printerr() in examples, (continued)
- [PATCH 27/46] qapi: Purge error_propagate() from QAPI core, Markus Armbruster, 2020/06/24
- [PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(),
Markus Armbruster <=
- [PATCH 33/46] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/06/24
- [PATCH 30/46] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/06/24
- [PATCH 44/46] qemu-img: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24