From bb8451ccedf49e397df5bac2e6174f3508f7f1df Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 7 Nov 2016 14:03:27 -0700 Subject: [PATCH] Replace rte_panic() with abort() Remove a DPDK dependency from generic code. Change-Id: I8e3e2c0a36d980b426a1967ed1f88fb8b855c382 Signed-off-by: Daniel Verkamp --- lib/bdev/bdev.c | 2 +- lib/iscsi/iscsi_subsystem.c | 2 +- lib/iscsi/task.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index c0b79a808..48ce05562 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -340,7 +340,7 @@ struct spdk_bdev_io *spdk_bdev_get_io(void) rc = rte_mempool_get(spdk_bdev_g_io_pool, (void **)&bdev_io); if (rc < 0 || !bdev_io) { SPDK_ERRLOG("Unable to get spdk_bdev_io\n"); - rte_panic("no memory\n"); + abort(); } memset(bdev_io, 0, sizeof(*bdev_io)); diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index 2b12be36b..899e6befa 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -512,7 +512,7 @@ struct spdk_iscsi_pdu *spdk_get_pdu(void) rc = rte_mempool_get(g_spdk_iscsi.pdu_pool, (void **)&pdu); if ((rc < 0) || !pdu) { SPDK_ERRLOG("Unable to get PDU\n"); - rte_panic("no memory\n"); + abort(); } /* we do not want to zero out the last part of the structure reserved for AHS and sense data */ diff --git a/lib/iscsi/task.c b/lib/iscsi/task.c index 5a4b280bf..ae02b6a0c 100644 --- a/lib/iscsi/task.c +++ b/lib/iscsi/task.c @@ -54,7 +54,7 @@ spdk_iscsi_task_get(uint32_t *owner_task_ctr, struct spdk_iscsi_task *parent) rc = rte_mempool_get(g_spdk_iscsi.task_pool, (void **)&task); if ((rc < 0) || !task) { SPDK_ERRLOG("Unable to get task\n"); - rte_panic("no memory\n"); + abort(); } memset(task, 0, sizeof(*task));