Commit ba1e1d53 authored by Ben Walker's avatar Ben Walker
Browse files

vhost: Rename LOG_DEBUG to VHOST_LOG_DEBUG 



LOG_DEBUG is a symbol defined by POSIX, so if sys/log.h
is included the symbols conflict.

We'll need to push this patch to upstream DPDK too.

Change-Id: Ib263731864aca4791226ea6e3abb5ddfe42e97d8
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 328bc32f

lib/vhost/rte_vhost/vhost.h

+5 −5
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ struct virtio_memory { 


#ifdef RTE_LIBRTE_VHOST_DEBUG

#define VHOST_MAX_PRINT_BUFF 6072

#define LOG_LEVEL RTE_LOG_DEBUG

#define LOG_DEBUG(log_type, fmt, args...) RTE_LOG(DEBUG, log_type, fmt, ##args)

#define VHOST_LOG_LEVEL RTE_LOG_DEBUG

#define VHOST_LOG_DEBUG(log_type, fmt, args...) RTE_LOG(DEBUG, log_type, fmt, ##args)

#define PRINT_PACKET(device, addr, size, header) do { \

	char *pkt_addr = (char *)(addr); \

	unsigned int index; \
@@ -224,11 +224,11 @@ struct virtio_memory { 
	} \

	snprintf(packet + strnlen(packet, VHOST_MAX_PRINT_BUFF), VHOST_MAX_PRINT_BUFF - strnlen(packet, VHOST_MAX_PRINT_BUFF), "\n"); \

	\

	LOG_DEBUG(VHOST_DATA, "%s", packet); \

	VHOST_LOG_DEBUG(VHOST_DATA, "%s", packet); \

} while (0)

#else

#define LOG_LEVEL RTE_LOG_INFO

#define LOG_DEBUG(log_type, fmt, args...) do {} while (0)

#define VHOST_LOG_LEVEL RTE_LOG_INFO

#define VHOST_LOG_DEBUG(log_type, fmt, args...) do {} while (0)

#define PRINT_PACKET(device, addr, size, header) do {} while (0)

#endif

lib/vhost/rte_vhost/vhost_user.c

+5 −5
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features) 
	} else {

		dev->vhost_hlen = sizeof(struct virtio_net_hdr);

	}

	LOG_DEBUG(VHOST_CONFIG,

	VHOST_LOG_DEBUG(VHOST_CONFIG,

		"(%d) mergeable RX buffers %s, virtio 1 %s\n",

		dev->vid,

		(dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? "on" : "off",
@@ -382,13 +382,13 @@ vhost_user_set_vring_addr(struct virtio_net *dev, VhostUserMsg *msg) 


	vq->log_guest_addr = msg->payload.addr.log_guest_addr;



	LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",

	VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",

			dev->vid, vq->desc);

	LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address avail: %p\n",

	VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address avail: %p\n",

			dev->vid, vq->avail);

	LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address used: %p\n",

	VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address used: %p\n",

			dev->vid, vq->used);

	LOG_DEBUG(VHOST_CONFIG, "(%d) log_guest_addr: %" PRIx64 "\n",

	VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) log_guest_addr: %" PRIx64 "\n",

			dev->vid, vq->log_guest_addr);



	return 0;

lib/vhost/rte_vhost/virtio_net.c

+8 −8
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id, 
	uint16_t used_idx;

	uint32_t i, sz;



	LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);

	if (unlikely(!is_valid_virt_queue_idx(queue_id, 0, dev->virt_qp_nb))) {

		RTE_LOG(ERR, VHOST_DATA, "(%d) %s: invalid virtqueue idx %d.\n",

			dev->vid, __func__, queue_id);
@@ -298,7 +298,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id, 
	if (count == 0)

		return 0;



	LOG_DEBUG(VHOST_DATA, "(%d) start_idx %d | end_idx %d\n",

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) start_idx %d | end_idx %d\n",

		dev->vid, start_idx, start_idx + count);



	/* Retrieve all of the desc indexes first to avoid caching issues. */
@@ -480,7 +480,7 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct rte_mbuf *m, 
	rte_prefetch0((void *)(uintptr_t)hdr_addr);



	virtio_hdr.num_buffers = num_buffers;

	LOG_DEBUG(VHOST_DATA, "(%d) RX: num merge buffers %d\n",

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) RX: num merge buffers %d\n",

		dev->vid, num_buffers);



	desc_avail  = buf_vec[vec_idx].buf_len - dev->vhost_hlen;
@@ -548,7 +548,7 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id, 
	struct buf_vector buf_vec[BUF_VECTOR_MAX];

	uint16_t avail_head;



	LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);

	if (unlikely(!is_valid_virt_queue_idx(queue_id, 0, dev->virt_qp_nb))) {

		RTE_LOG(ERR, VHOST_DATA, "(%d) %s: invalid virtqueue idx %d.\n",

			dev->vid, __func__, queue_id);
@@ -573,14 +573,14 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id, 
		if (unlikely(reserve_avail_buf_mergeable(dev, vq,

						pkt_len, buf_vec, &num_buffers,

						avail_head) < 0)) {

			LOG_DEBUG(VHOST_DATA,

			VHOST_LOG_DEBUG(VHOST_DATA,

				"(%d) failed to get enough desc from vring\n",

				dev->vid);

			vq->shadow_used_idx -= num_buffers;

			break;

		}



		LOG_DEBUG(VHOST_DATA, "(%d) current index %d | end index %d\n",

		VHOST_LOG_DEBUG(VHOST_DATA, "(%d) current index %d | end index %d\n",

			dev->vid, vq->last_avail_idx,

			vq->last_avail_idx + num_buffers);
@@ -1079,7 +1079,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, 
	if (free_entries == 0)

		goto out;



	LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__);



	/* Prefetch available and used ring */

	avail_idx = vq->last_avail_idx & (vq->size - 1);
@@ -1089,7 +1089,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, 


	count = RTE_MIN(count, MAX_PKT_BURST);

	count = RTE_MIN(count, free_entries);

	LOG_DEBUG(VHOST_DATA, "(%d) about to dequeue %u buffers\n",

	VHOST_LOG_DEBUG(VHOST_DATA, "(%d) about to dequeue %u buffers\n",

			dev->vid, count);



	/* Retrieve all of the head indexes first to avoid caching issues. */