e2a3f1cc6e
Make sure DEBUG macro is not defined while processing log macros,
otherwise DEBUG (which should be passed as is down to RTE_LOG and
concatenated with RTE_LOG_ prefix) gets substituted too early:
In file included from /spdk/dpdk/build/include/rte_debug.h:46:0,
from /spdk/dpdk/build/include/rte_pci.h:85,
from rte_virtio/virtio_dev.c:48:
rte_virtio/virtio_dev.c: In function ‘virtio_init_vring’:
/spdk/dpdk/build/include/rte_log.h:333:11: error: ‘RTE_LOG_1’ undeclared (first use in this function)
rte_log(RTE_LOG_ ## l, \
^
rte_virtio/virtio_logs.h:41:2: note: in expansion of macro ‘RTE_LOG’
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
^
rte_virtio/virtio_logs.h:42:31: note: in expansion of macro ‘PMD_INIT_LOG’
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
^
rte_virtio/virtio_dev.c:82:2: note: in expansion of macro ‘PMD_INIT_FUNC_TRACE’
PMD_INIT_FUNC_TRACE();
While at this, change format string type specifier to the correct one.
Change-Id: I7f7bda105aa00b99bea4ea5f6a9bff268940a557
Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
Reviewed-on: https://review.gerrithub.io/377945
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
76 lines
2.8 KiB
C
76 lines
2.8 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _VIRTIO_LOGS_H_
|
|
#define _VIRTIO_LOGS_H_
|
|
|
|
#include <rte_log.h>
|
|
|
|
/* Make sure DEBUG macro doesn't shadow DEBUG log level */
|
|
#ifdef DEBUG
|
|
#undef DEBUG
|
|
#endif
|
|
|
|
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_INIT
|
|
#define PMD_INIT_LOG(level, fmt, args...) \
|
|
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
|
|
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
|
|
#else
|
|
#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)
|
|
#define PMD_INIT_FUNC_TRACE() do { } while(0)
|
|
#endif
|
|
|
|
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_RX
|
|
#define PMD_RX_LOG(level, fmt, args...) \
|
|
RTE_LOG(level, PMD, "%s() rx: " fmt "\n", __func__, ## args)
|
|
#else
|
|
#define PMD_RX_LOG(level, fmt, args...) do { } while(0)
|
|
#endif
|
|
|
|
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_TX
|
|
#define PMD_TX_LOG(level, fmt, args...) \
|
|
RTE_LOG(level, PMD, "%s() tx: " fmt "\n", __func__, ## args)
|
|
#else
|
|
#define PMD_TX_LOG(level, fmt, args...) do { } while(0)
|
|
#endif
|
|
|
|
|
|
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_DRIVER
|
|
#define PMD_DRV_LOG(level, fmt, args...) \
|
|
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
|
|
#else
|
|
#define PMD_DRV_LOG(level, fmt, args...) do { } while(0)
|
|
#endif
|
|
|
|
#endif /* _VIRTIO_LOGS_H_ */
|