From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <aconole@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id 44A69F967
for <dev@dpdk.org>; Thu, 9 Feb 2017 15:30:18 +0100 (CET)
Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com
[10.5.11.28])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id B30C23DBD9;
Thu, 9 Feb 2017 14:30:18 +0000 (UTC)
Received: from dhcp-25-97.bos.redhat.com (unknown [10.10.123.29])
by smtp.corp.redhat.com (Postfix) with ESMTP id 5E9326E909;
Thu, 9 Feb 2017 14:30:17 +0000 (UTC)
From: Aaron Conole <aconole@redhat.com>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 9 Feb 2017 09:29:44 -0500
Message-Id: <20170209142953.8167-17-aconole@redhat.com>
In-Reply-To: <20170209142953.8167-1-aconole@redhat.com>
References: <20170208185142.28678-1-aconole@redhat.com>
<20170209142953.8167-1-aconole@redhat.com>
X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.30]); Thu, 09 Feb 2017 14:30:18 +0000 (UTC)
Subject: [dpdk-dev] [PATCH v3 16/25] eal: convert timer_init not to call
panic
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2017 14:30:18 -0000
After code inspection, there is no way for eal_timer_init() to fail. It
simply returns 0 in all cases. As such, this test could either go-away
or stay here as 'future-proofing'.
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
lib/librte_eal/linuxapp/eal/eal.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 5dcd2d5..805f284 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -870,8 +870,11 @@ rte_eal_init(int argc, char **argv)
return -1;
}
- if (rte_eal_timer_init() < 0)
- rte_panic("Cannot init HPET or TSC timers\n");
+ if (rte_eal_timer_init() < 0) {
+ RTE_LOG(ERR, EAL, "Cannot init HPET or TSC timers\n");
+ rte_errno = ENOTSUP;
+ return -1;
+ }
eal_check_mem_on_local_socket();
--
2.9.3