From patchwork Mon Jun 29 21:02:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 489424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 799D7140779 for ; Tue, 30 Jun 2015 07:04:47 +1000 (AEST) Received: from localhost ([::1]:44046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9gEP-0000yl-LG for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2015 17:04:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9gC7-0004r0-9G for qemu-devel@nongnu.org; Mon, 29 Jun 2015 17:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9gC0-0007xE-1e for qemu-devel@nongnu.org; Mon, 29 Jun 2015 17:02:23 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:19024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9gBz-0007x1-Qk for qemu-devel@nongnu.org; Mon, 29 Jun 2015 17:02:15 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t5TL2Atn026563 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Jun 2015 21:02:11 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t5TL29OH024276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 29 Jun 2015 21:02:10 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t5TL29U2024873; Mon, 29 Jun 2015 21:02:09 GMT Received: from l.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 29 Jun 2015 14:02:09 -0700 Received: by l.oracle.com (Postfix, from userid 1000) id D8F8B6A0271; Mon, 29 Jun 2015 17:02:07 -0400 (EDT) From: Konrad Rzeszutek Wilk To: stefano.stabellini@eu.citrix.com, xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Date: Mon, 29 Jun 2015 17:02:05 -0400 Message-Id: <1435611725-15161-9-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435611725-15161-1-git-send-email-konrad.wilk@oracle.com> References: <1435611725-15161-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 Cc: Konrad Rzeszutek Wilk Subject: [Qemu-devel] [PATCH RFC 1 8/8] xen/pt: Check for return values for xen_host_pci_[get|set] in init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org and if we have failures we call xen_pt_destroy introduced in 'xen/pt: Move bulk of xen_pt_unregister_device in its own routine.' and free all of the allocated structures. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini --- hw/xen/xen_pt.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 589c6c6..ce202e9 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -779,10 +779,11 @@ static int xen_pt_initfn(PCIDevice *d) } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ - if (xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE) < 0) { - xen_host_pci_device_put(&s->real_device); - return -1; + rc = xen_host_pci_get_block(&s->real_device, 0, d->config, + PCI_CONFIG_SPACE_SIZE); + if (rc < 0) { + XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc); + goto err_out; } s->memory_listener = xen_pt_memory_listener; @@ -792,17 +793,18 @@ static int xen_pt_initfn(PCIDevice *d) xen_pt_register_regions(s, &cmd); /* reinitialize each config register to be emulated */ - if (xen_pt_config_init(s)) { + rc = xen_pt_config_init(s); + if (rc) { XEN_PT_ERR(d, "PCI Config space initialisation failed.\n"); - xen_host_pci_device_put(&s->real_device); - return -1; + goto err_out; } /* Bind interrupt */ - if (xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, - &machine_irq /* temp scratch */)) { + rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, + &machine_irq /* temp scratch */); + if (rc) { XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); - machine_irq = 0; + goto err_out; } if (!machine_irq) { XEN_PT_LOG(d, "no pin interrupt\n"); @@ -859,12 +861,15 @@ out: rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); if (rc) { XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); + goto err_out; } else { val |= cmd; - if (xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val)) { + rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); + if (rc) { XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", val, rc); + goto err_out; } } } @@ -877,6 +882,11 @@ out: s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); return 0; + +err_out: + xen_pt_destroy(d); + assert(rc); + return rc; } static void xen_pt_unregister_device(PCIDevice *d)