From ac0c14d71b68ac18f03a876028e332534e1e6a3e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 6 Jul 2010 14:37:42 +0200 Subject: [PATCH] virtio-pci: Check for virtio_blk_init() failure It can't actually fail now, but the next commit will change that. s390_virtio_blk_init() already checks for failure, but virtio_blk_init_pci() doesn't. Fix that. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/virtio-pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c728fffd73..55831665f6 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -551,6 +551,9 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev) return -1; } vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block); + if (!vdev) { + return -1; + } vdev->nvectors = proxy->nvectors; virtio_init_pci(proxy, vdev, PCI_VENDOR_ID_REDHAT_QUMRANET, -- 2.30.2