[dpdk-dev] compat: add virtio crypto header file

Message ID 1523698014-29444-1-git-send-email-jianjay.zhou@huawei.com (mailing list archive)
State Not Applicable, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Zhoujian (jay) April 14, 2018, 9:26 a.m. UTC
  Moving the virtio crypto header file from vhost lib to compat lib,
then this header file can be shared between vhost crypto backend and
virtio crypto PMD.

Signed-off-by: Jay Zhou <jianjay.zhou@huawei.com>
---
 lib/librte_compat/Makefile                          | 3 ++-
 lib/librte_compat/meson.build                       | 2 +-
 lib/{librte_vhost => librte_compat}/virtio_crypto.h | 0
 lib/librte_vhost/vhost_crypto.c                     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename lib/{librte_vhost => librte_compat}/virtio_crypto.h (100%)
  

Comments

Fan Zhang April 16, 2018, 11:27 a.m. UTC | #1
> -----Original Message-----
> From: Jay Zhou [mailto:jianjay.zhou@huawei.com]
> Sent: Saturday, April 14, 2018 10:27 AM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>;
> Tan, Jianfeng <jianfeng.tan@intel.com>; Zhang, Roy Fan
> <roy.fan.zhang@intel.com>; arei.gonglei@huawei.com;
> weidong.huang@huawei.com; wangxinxin.wang@huawei.com;
> jianjay.zhou@huawei.com
> Subject: [PATCH] compat: add virtio crypto header file
> 
> Moving the virtio crypto header file from vhost lib to compat lib, then this
> header file can be shared between vhost crypto backend and virtio crypto
> PMD.
> 
> Signed-off-by: Jay Zhou <jianjay.zhou@huawei.com>
> ---

Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
  

Patch

diff --git a/lib/librte_compat/Makefile b/lib/librte_compat/Makefile
index 0c57533c1..5f78824c1 100644
--- a/lib/librte_compat/Makefile
+++ b/lib/librte_compat/Makefile
@@ -35,6 +35,7 @@  include $(RTE_SDK)/mk/rte.vars.mk
 LIBABIVER := 1
 
 # install includes
-SYMLINK-y-include := rte_compat.h
+SYMLINK-y-include += rte_compat.h
+SYMLINK-y-include += virtio_crypto.h
 
 include $(RTE_SDK)/mk/rte.install.mk
diff --git a/lib/librte_compat/meson.build b/lib/librte_compat/meson.build
index 82c7eea55..28762288e 100644
--- a/lib/librte_compat/meson.build
+++ b/lib/librte_compat/meson.build
@@ -2,7 +2,7 @@ 
 # Copyright(c) 2017 Intel Corporation
 
 
-install_headers('rte_compat.h')
+install_headers('rte_compat.h', 'virtio_crypto.h')
 
 set_variable('dep_rte_compat',
 	declare_dependency(include_directories: include_directories('.')))
diff --git a/lib/librte_vhost/virtio_crypto.h b/lib/librte_compat/virtio_crypto.h
similarity index 100%
rename from lib/librte_vhost/virtio_crypto.h
rename to lib/librte_compat/virtio_crypto.h
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index c154ef673..6e1f5eda5 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -6,11 +6,11 @@ 
 #include <rte_jhash.h>
 #include <rte_mbuf.h>
 #include <rte_cryptodev.h>
+#include <virtio_crypto.h>
 
 #include "rte_vhost_crypto.h"
 #include "vhost.h"
 #include "vhost_user.h"
-#include "virtio_crypto.h"
 
 #define INHDR_LEN		(sizeof(struct virtio_crypto_inhdr))
 #define IV_OFFSET		(sizeof(struct rte_crypto_op) + \