From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 3F68ADED for ; Mon, 30 Apr 2018 16:06:27 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id p18-v6so8173992wrm.1 for ; Mon, 30 Apr 2018 07:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OyQrcZ8RJPjLJ5rFa3P5DHMdvkVWXXwRGW4X0x09Q7o=; b=nmh5cn4RO15q1U6In78rFBTiSpIgzgZTxHNw5bpyvP3yCXtBtenea32pLILt9qHz9k yv6IkK2mUjhqyvdHqrXKASu6Aygnc6M0xd845Y2QEcSkQoJoJMWIMBjE4Zkb4/KALz2g +SQeHX5euoA798cW/V22Lixj4DWfsuTQvs0ai8B+uNABbPCTGff6IKbgnYgQcJYRvXE+ Xp9x4mBJAKGo5fWQ08LOTev8gGtD0NPaZzRE3/pwfcfVcPymYx8ypp8pPGEe8a5Kk6df FjLdITN4XY9rQ9moqMXyFx/3brOadW0WfzNOKqpeG7LCot3R6ABg28vOUH45/yM1Kqwv muBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OyQrcZ8RJPjLJ5rFa3P5DHMdvkVWXXwRGW4X0x09Q7o=; b=RxqEfq9ZY2Qsib5zBmQ3kV1JRFe8IxF9NzqNmySgQd6zoYoNHfHd0hyK9u735yjfA3 E/kwydqcsTSjXyNzgSRIdAhibvfwsAcU9V9r8fVAiKgsn5z9pRhkCkmMISfjOj5p+QP8 yoKvo1OC/k7uRD+ehu+3JRIsPzeRpx8lh2fEufBNMeJ1h94awK0T5V8+/hcLnZjX8b9c tNJaHxJqTybh/I1HcwdgtkWUvwoCFnsGDFHabvBUONKRwBJ78zuykcVCPGT+y+0YptxO oqTePtykmqIBizVxqBzmh0NURIbVSsuYlixxW4rtPmxVoMgziYS8bEPuXdB+Bqn5Mczu f8Zw== X-Gm-Message-State: ALQs6tCtfOFL2R+i2eqI0XzSSr8TiYafl5TdgrP2PRIC5uINd1eM60hW u6NaxrxIOgNDgfoPQsQxw/g= X-Google-Smtp-Source: AB8JxZop7mCle/G+2cOcQP7qq+eBucaZQQ9KNWDdu/c8u0b8QkjW6XSVVeHzpiBJLDtYIc4HC7GpIA== X-Received: by 2002:adf:9ae5:: with SMTP id a92-v6mr8547486wrc.180.1525097186877; Mon, 30 Apr 2018 07:06:26 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id m64sm1134353wmb.12.2018.04.30.07.06.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:06:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Luca Boccassi , dpdk stable Date: Mon, 30 Apr 2018 15:02:39 +0100 Message-Id: <20180430140606.4615-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix compilation issue when vhost debug enabled' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2018 14:06:27 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 7869d984142713f6a94003d6991d83345ba8453b Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Mon, 23 Apr 2018 19:03:18 +0200 Subject: [PATCH] vhost: fix compilation issue when vhost debug enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes below compilation issue when RTE_LIBRTE_VHOST_DEBUG is enabled: In file included from ./lib/librte_vhost/virtio_net.c:50:0: ./lib/librte_vhost/virtio_net.c: In function ‘copy_mbuf_to_desc’: ./lib/librte_vhost/vhost.h:205:42: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘uint64_t {aka long unsigned int}’ [-Wformat=] snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%d) Header size %d: ", (device->vid), (size)); \ ^ ./lib/librte_vhost/virtio_net.c:301:4: note: in expansion of macro ‘PRINT_PACKET’ PRINT_PACKET(dev, (uintptr_t)dst, len, 0); ^~~~~~~~~~~~ Fixes: de7f26b5c35c ("vhost: handle virtually non-contiguous buffers in Tx") Fixes: f98ac647a76f ("vhost: handle virtually non-contiguous buffers in Rx") Fixes: 5fe57f56573d ("vhost: handle virtually non-contiguous buffers in Rx-mrg") Signed-off-by: Maxime Coquelin Acked-by: Luca Boccassi --- lib/librte_vhost/virtio_net.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 3d08ddf09..89b5b5f86 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -273,7 +273,7 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, rte_memcpy((void *)(uintptr_t)dst, (void *)(uintptr_t)src, len); - PRINT_PACKET(dev, (uintptr_t)dst, len, 0); + PRINT_PACKET(dev, (uintptr_t)dst, (uint32_t)len, 0); vhost_log_write(dev, guest_addr, len); remain -= len; guest_addr += len; @@ -766,7 +766,7 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq, len); PRINT_PACKET(dev, (uintptr_t)dst, - len, 0); + (uint32_t)len, 0); vhost_log_write(dev, guest_addr, len); remain -= len; @@ -1170,7 +1170,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq, rte_prefetch0((void *)(uintptr_t)(desc_addr + desc_offset)); PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset), - desc_chunck_len, 0); + (uint32_t)desc_chunck_len, 0); mbuf_offset = 0; mbuf_avail = m->buf_len - RTE_PKTMBUF_HEADROOM; @@ -1258,7 +1258,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_avail = desc->len; PRINT_PACKET(dev, (uintptr_t)desc_addr, - desc_chunck_len, 0); + (uint32_t)desc_chunck_len, 0); } else if (unlikely(desc_chunck_len == 0)) { desc_chunck_len = desc_avail; desc_gaddr += desc_offset; @@ -1273,7 +1273,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_offset = 0; PRINT_PACKET(dev, (uintptr_t)desc_addr, - desc_chunck_len, 0); + (uint32_t)desc_chunck_len, 0); } /* -- 2.14.2