Re: [git pull] virtio changes for 17.11-rc1

[Yuanhan Liu <yliu@fridaylinux.org>]

On Sun, Oct 08, 2017 at 10:16:29PM +0200, Thomas Monjalon wrote:
> 08/10/2017 22:10, Olivier MATZ:
> > Hi Thomas,
> > 
> > On Sat, Oct 07, 2017 at 04:37:53PM +0200, Thomas Monjalon wrote:
> > > 06/10/2017 08:45, Yuanhan Liu:
> > > > Hi Thomas,
> > > > 
> > > > Please consider pulling following virtio changes for 17.11-rc1 at
> > > >     git://dpdk.org/next/dpdk-next-virtio    master
> > > 
> > > There is a compilation error on ARM with
> > > "net/virtio: rationalize setting of Rx/Tx handlers"
> > > An include of rte_cpuflags.h is missing.
> > 
> > I confirm that this include is missing in virtio_ethdev.c, breaking
> > compilation on arm (thanks for spotting it):
> > 
> >  virtio_ethdev.c: In function 'virtio_dev_configure':
> >  virtio_ethdev.c:1748:7: error: implicit declaration of function
> >         'rte_cpu_get_flag_enabled' [-Werror=implicit-function-declaration]
> >    if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) {
> >         ^
> > 
> > Thomas, about this issue, what do you expect? I can send another patch
> > if required.
> 
> It can be fixed by Yuanhan in next-virtio tree.

Yes, I will fix them and then send another pull request.

Olivier and Maxime, please confirm the following fixes.

Thanks.

	--yliu

---
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 9fb71e6..42c2836 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -49,6 +49,7 @@
 #include <rte_ether.h>
 #include <rte_common.h>
 #include <rte_errno.h>
+#include <rte_cpuflags.h>

 #include <rte_memory.h>
 #include <rte_eal.h>
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 45a9c91..609b413 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -50,7 +50,6 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_byteorder.h>
-#include <rte_cpuflags.h>
 #include <rte_net.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index f891f57..207fda5 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1352,7 +1352,7 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
 {
        int ret;
        struct VhostUserMsg msg = {
-               .request = VHOST_USER_SLAVE_IOTLB_MSG,
+               .request = (enum VhostUserRequest)VHOST_USER_SLAVE_IOTLB_MSG,
                .flags = VHOST_USER_VERSION,
                .size = sizeof(msg.payload.iotlb),
                .payload.iotlb = {