> -----Original Message----- > From: Markus Armbruster [mailto:arm...@redhat.com] > Sent: Thursday, June 25, 2020 12:43 AM > To: qemu-devel@nongnu.org > Cc: pbonz...@redhat.com; berra...@redhat.com; ehabk...@redhat.com; > qemu-bl...@nongnu.org; peter.mayd...@linaro.org; > vsement...@virtuozzo.com; Gonglei (Arei) <arei.gong...@huawei.com>; > Michael S . Tsirkin <m...@redhat.com> > Subject: [PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() > > 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.gong...@huawei.com> > Cc: Michael S. Tsirkin <m...@redhat.com> > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > hw/virtio/virtio-crypto-pci.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >
Reviewed-by: Gonglei < arei.gong...@huawei.com> > 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