From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46809 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7PN-0005xP-7S for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW7PM-000806-1A for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:53 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:60883) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW7PL-0007zd-Qr for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:51 -0400 From: Markus Armbruster Date: Tue, 6 Jul 2010 14:37:42 +0200 Message-Id: <1278419869-26126-2-git-send-email-armbru@redhat.com> In-Reply-To: <1278419869-26126-1-git-send-email-armbru@redhat.com> References: <1278419869-26126-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/8] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de 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 --- 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 c6ef825..c6edcc2 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -552,6 +552,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.6.6.1