From patchwork Sat Apr 14 09:26:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhoujian (jay)" X-Patchwork-Id: 38100 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8FA5D1B722; Sat, 14 Apr 2018 11:27:19 +0200 (CEST) Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by dpdk.org (Postfix) with ESMTP id 75C4B1B681 for ; Sat, 14 Apr 2018 11:27:18 +0200 (CEST) Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 63C3D350F95AC; Sat, 14 Apr 2018 17:27:05 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Sat, 14 Apr 2018 17:26:57 +0800 From: Jay Zhou To: CC: , , , , , , , , Date: Sat, 14 Apr 2018 17:26:54 +0800 Message-ID: <1523698014-29444-1-git-send-email-jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH] compat: add virtio crypto header file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Fan Zhang --- 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%) 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 #include #include +#include #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) + \