From: Cole Robinson Date: Fri, 31 May 2013 18:12:48 +0000 (-0400) Subject: virtio-rng: Fix crash with non-default backend X-Git-Tag: v1.5.1~2 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=12e5b2b5dafeed4c14080f3c1ff40e3db9802433 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 59ccd20a9ac719cff82180429458728f03ec612f CC: qemu-stable@nongnu.org Signed-off-by: Cole Robinson Acked-by: Amit Shah Acked-by: Michael S. Tsirkin Tested-by: Michael Roth Message-id: bf4505014a0a941dbd3c62068f3cf2c496b69e6a.1370023944.git.crobinso@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit 5b456438f5bb395ed6b1eec95e18ce7a7a884a0a) Signed-off-by: Michael Roth --- diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index a1cdfb059..207eb82e9 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -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)); diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 44f5772bb..201a63560 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -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)); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 70d2c6b5e..161ade36c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1461,7 +1461,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;