From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51621 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYhoc-0006Kg-3t for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYhoa-0001ZE-3b for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35316) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYhoZ-0001Z5-Sd for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:36 -0400 From: Kevin Wolf Date: Tue, 13 Jul 2010 17:54:24 +0200 Message-Id: <1279036466-19934-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1279036466-19934-1-git-send-email-kwolf@redhat.com> References: <1279036466-19934-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] virtio-pci: Check for virtio_blk_init() failure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 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