Commit 5b456438 authored by Cole Robinson's avatar Cole Robinson Committed by Anthony Liguori
Browse files

virtio-rng: Fix crash with non-default backend 



'default_backend' isn't always set, but 'rng' is, so use that.

$ ./x86_64-softmmu/qemu-system-x86_64 -object rng-random,id=rng0,filename=/dev/random -device virtio-rng-pci,rng=rng0
Segmentation fault (core dumped)

Regressed with virtio refactoring in 59ccd20a

CC: qemu-stable@nongnu.org
Signed-off-by: default avatarCole Robinson <crobinso@redhat.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Message-id: bf4505014a0a941dbd3c62068f3cf2c496b69e6a.1370023944.git.crobinso@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent afd59989

hw/s390x/s390-virtio-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev) 
    }



    object_property_set_link(OBJECT(dev),

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

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

                             NULL);



    return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));

hw/s390x/virtio-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static int virtio_ccw_rng_init(VirtioCcwDevice *ccw_dev) 
    }



    object_property_set_link(OBJECT(dev),

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

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

                             NULL);



    return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev));

hw/virtio/virtio-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ static int virtio_rng_pci_init(VirtIOPCIProxy *vpci_dev) 
    }



    object_property_set_link(OBJECT(vrng),

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

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

                             NULL);



    return 0;