From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XioCo-0006Ea-Gl for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XioCh-0002BW-WE for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XioCh-0002BQ-N7 for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:39 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9RHZcgh020427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 27 Oct 2014 13:35:39 -0400 From: Marcel Apfelbaum Date: Mon, 27 Oct 2014 19:34:41 +0200 Message-Id: <1414431282-9839-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1414431282-9839-1-git-send-email-marcel.a@redhat.com> References: <1414431282-9839-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH v4 1/2] hw/pci: fixed error flow in pci_qdev_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, armbru@redhat.com, alex.williamson@redhat.com, marcel@redhat.com, pbonzini@redhat.com Verify return code for pci_add_option_rom. Signed-off-by: Marcel Apfelbaum --- hw/pci/pci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 6ce75aa..36226eb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1776,7 +1776,12 @@ static int pci_qdev_init(DeviceState *qdev) pci_dev->romfile = g_strdup(pc->romfile); is_default_rom = true; } - pci_add_option_rom(pci_dev, is_default_rom); + + rc = pci_add_option_rom(pci_dev, is_default_rom); + if (rc != 0) { + pci_unregister_device(DEVICE(pci_dev)); + return rc; + } return 0; } -- 1.8.3.1