From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 6 Jul 2010 12:37:42 +0000 (+0200)
Subject: virtio-pci: Check for virtio_blk_init() failure
X-Git-Tag: xen-15-06-02~7257^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ac0c14d71b68ac18f03a876028e332534e1e6a3e;p=people%2Fsstabellini%2Fqemu-dm.git%2F.git

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

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,