@@ -2682,7 +2682,7 @@ rte_cryptodev_driver_id_get(const char *name)
int driver_id = -1;
if (name == NULL) {
- RTE_LOG(DEBUG, CRYPTODEV, "name pointer NULL");
+ CDEV_LOG_DEBUG("name pointer NULL");
return -1;
}
@@ -487,7 +487,7 @@ rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs *eth_da)
pair = &args.pairs[i];
if (strcmp("representor", pair->key) == 0) {
if (eth_da->type != RTE_ETH_REPRESENTOR_NONE) {
- RTE_LOG(ERR, EAL, "duplicated representor key: %s\n",
+ RTE_ETHDEV_LOG(ERR, "duplicated representor key: %s\n",
dargs);
result = -1;
goto parse_cleanup;
@@ -713,7 +713,7 @@ rte_eth_representor_id_get(uint16_t port_id,
if (info->ranges[i].controller != controller)
continue;
if (info->ranges[i].id_end < info->ranges[i].id_base) {
- RTE_LOG(WARNING, EAL, "Port %hu invalid representor ID Range %u - %u, entry %d\n",
+ RTE_ETHDEV_LOG(WARNING, "Port %hu invalid representor ID Range %u - %u, entry %d\n",
port_id, info->ranges[i].id_base,
info->ranges[i].id_end, i);
continue;
@@ -182,7 +182,7 @@ rte_eth_devargs_parse_representor_ports(char *str, void *data)
RTE_DIM(eth_da->representor_ports));
done:
if (str == NULL)
- RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);
+ RTE_ETHDEV_LOG(ERR, "wrong representor format: %s\n", str);
return str == NULL ? -1 : 0;
}
@@ -165,7 +165,7 @@ eth_dev_iterate(const void *start,
valid_keys = eth_params_keys;
kvargs = rte_kvargs_parse(str, valid_keys);
if (kvargs == NULL) {
- RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ RTE_ETHDEV_LOG(ERR, "cannot parse argument list\n");
rte_errno = EINVAL;
return NULL;
}
@@ -1046,7 +1046,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->vchanq == NULL) {
- printf("Queue pair add not supported\n");
+ RTE_EDEV_LOG_ERR("Queue pair add not supported");
return -ENOMEM;
}
}
@@ -1057,7 +1057,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->tqmap == NULL) {
- printf("tq pair add not supported\n");
+ RTE_EDEV_LOG_ERR("tq pair add not supported");
return -ENOMEM;
}
}
@@ -314,9 +314,9 @@ rxa_event_buf_get(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id,
} \
} while (0)
-#define RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(port_id, retval) do { \
+#define RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(port_id, retval) do { \
if (!rte_eth_dev_is_valid_port(port_id)) { \
- RTE_ETHDEV_LOG(ERR, "Invalid port_id=%u\n", port_id); \
+ RTE_EDEV_LOG_ERR("Invalid port_id=%u", port_id); \
ret = retval; \
goto error; \
} \
@@ -3671,7 +3671,7 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3743,7 +3743,7 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3813,7 +3813,7 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3868,7 +3868,7 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -1428,8 +1428,8 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
int ret;
if (!nb_elem) {
- RTE_LOG(ERR, EVENTDEV,
- "Invalid number of elements=%d requested\n", nb_elem);
+ RTE_EDEV_LOG_ERR("Invalid number of elements=%d requested",
+ nb_elem);
rte_errno = EINVAL;
return NULL;
}
@@ -1444,7 +1444,7 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
mp_ops_name = rte_mbuf_best_mempool_ops();
ret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);
if (ret != 0) {
- RTE_LOG(ERR, EVENTDEV, "error setting mempool handler\n");
+ RTE_EDEV_LOG_ERR("error setting mempool handler");
goto err;
}
@@ -46,7 +46,7 @@ rte_mempool_register_ops(const struct rte_mempool_ops *h)
if (strlen(h->name) >= sizeof(ops->name) - 1) {
rte_spinlock_unlock(&rte_mempool_ops_table.sl);
- RTE_LOG(DEBUG, EAL, "%s(): mempool_ops <%s>: name too long\n",
+ RTE_LOG(DEBUG, MEMPOOL, "%s(): mempool_ops <%s>: name too long\n",
__func__, h->name);
rte_errno = EEXIST;
return -EEXIST;