david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-rng: Fix crash with non-default backend

Browse Source 
'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 <crobinso@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Message-id: bf4505014a0a941dbd3c62068f3cf2c496b69e6a.1370023944.git.crobinso@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Cole Robinson 2013-05-31 14:12:48 -04:00 committed by Anthony Liguori
parent afd59989db
commit 5b456438f5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-virtio-bus.c
View File

@ -300,7 +300,7 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev)
} }
object_property_set_link(OBJECT(dev), object_property_set_link(OBJECT(dev),
OBJECT(dev->vdev.conf.default_backend), "rng", OBJECT(dev->vdev.conf.rng), "rng",
NULL); NULL);
return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));

2
hw/s390x/virtio-ccw.c
View File

@ -744,7 +744,7 @@ static int virtio_ccw_rng_init(VirtioCcwDevice *ccw_dev)
} }
object_property_set_link(OBJECT(dev), object_property_set_link(OBJECT(dev),
OBJECT(dev->vdev.conf.default_backend), "rng", OBJECT(dev->vdev.conf.rng), "rng",
NULL); NULL);
return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev)); return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev));

2
hw/virtio/virtio-pci.c
View File

@ -1455,7 +1455,7 @@ static int virtio_rng_pci_init(VirtIOPCIProxy *vpci_dev)
} }
object_property_set_link(OBJECT(vrng), object_property_set_link(OBJECT(vrng),
OBJECT(vrng->vdev.conf.default_backend), "rng", OBJECT(vrng->vdev.conf.rng), "rng",
NULL); NULL);
return 0; return 0;