[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] virtio-pci: Check for virtio_blk_init() failure
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 3/5] virtio-pci: Check for virtio_blk_init() failure |
Date: |
Tue, 13 Jul 2010 17:54:24 +0200 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/virtio-pci.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index c728fff..5583166 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,
--
1.7.1.1
- [Qemu-devel] [PULL 0/5] Block patches, Kevin Wolf, 2010/07/13
- [Qemu-devel] [PATCH 1/5] qemu-img: Fix copy+paste bug in documentation, Kevin Wolf, 2010/07/13
- [Qemu-devel] [PATCH 3/5] virtio-pci: Check for virtio_blk_init() failure,
Kevin Wolf <=
- [Qemu-devel] [PATCH 4/5] virtio-blk: Fix virtio-blk-s390 to require drive, Kevin Wolf, 2010/07/13
- [Qemu-devel] [PATCH 2/5] Block migration fail, ignore error from bdrv_getlength, Kevin Wolf, 2010/07/13
- [Qemu-devel] [PATCH 5/5] ide scsi virtio-blk: Reject empty drives unless media is removable, Kevin Wolf, 2010/07/13
- Re: [Qemu-devel] [PULL 0/5] Block patches, Brian Jackson, 2010/07/13