From patchwork Tue Apr 24 06:41:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnon Warshavsky X-Patchwork-Id: 38778 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 08A243DC; Tue, 24 Apr 2018 08:42:30 +0200 (CEST) Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id 923282C23 for ; Tue, 24 Apr 2018 08:42:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mta.qwilt.com (Postfix) with ESMTP id E36FA80C4BE; Tue, 24 Apr 2018 06:42:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at qwilt.com Received: from mta.qwilt.com ([127.0.0.1]) by localhost (mta.qwilt.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vyIoBqfYo2Sr; Tue, 24 Apr 2018 06:42:25 +0000 (UTC) Received: from rd01.it.qwilt.com.qwilt.com (80.179.204.39.cable.012.net.il [80.179.204.39]) by mta.qwilt.com (Postfix) with ESMTPSA id 2479680C4C9; Tue, 24 Apr 2018 06:42:22 +0000 (UTC) From: Arnon Warshavsky To: thomas@monjalon.net, anatoly.burakov@intel.com, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, arnon@qwilt.com Date: Tue, 24 Apr 2018 09:41:57 +0300 Message-Id: <1524552123-31378-6-git-send-email-arnon@qwilt.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524552123-31378-1-git-send-email-arnon@qwilt.com> References: <1524552123-31378-1-git-send-email-arnon@qwilt.com> Subject: [dpdk-dev] [PATCH v6 05/11] eal: replace rte_panic instances in eventdev X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" replace panic calls with log and return value. Signed-off-by: Arnon Warshavsky --- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 8 +++++--- lib/librte_eventdev/rte_eventdev_pmd_vdev.h | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h index 8fb6138..6e08705 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h +++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h @@ -66,9 +66,11 @@ RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (eventdev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (eventdev->data->dev_private == NULL) { + RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } eventdev->dev = &pci_dev->device; diff --git a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h index 8c64a06..b7c08fa 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h +++ b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h @@ -61,9 +61,11 @@ RTE_CACHE_LINE_SIZE, socket_id); - if (eventdev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private device" - " data"); + if (eventdev->data->dev_private == NULL) { + RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data", + __func__); + return NULL; + } } return eventdev;