From patchwork Tue Jul 13 15:54:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 58796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B8A571007D3 for ; Wed, 14 Jul 2010 01:57:16 +1000 (EST) Received: from localhost ([127.0.0.1]:56364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYhr7-0007Bt-L7 for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2010 11:57:13 -0400 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6DFsXxw004130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Jul 2010 11:54:33 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-217.str.redhat.com [10.32.5.217]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6DFsSan006368; Tue, 13 Jul 2010 11:54:32 -0400 From: Kevin Wolf To: anthony@codemonkey.ws 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 3/5] virtio-pci: Check for virtio_blk_init() failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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,