From patchwork Tue May 15 21:19:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 40072 X-Patchwork-Delegate: thomas@monjalon.net 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 A77321B796; Tue, 15 May 2018 23:19:49 +0200 (CEST) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by dpdk.org (Postfix) with ESMTP id 676F81B782 for ; Tue, 15 May 2018 23:19:46 +0200 (CEST) Received: by mail-pl0-f65.google.com with SMTP id u6-v6so769412pls.9 for ; Tue, 15 May 2018 14:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sv5npA99HW6kdcMPlrXCf9qbYo14Z5xEJsn2NB1sl1g=; b=E9lweLYaBTVQd++2KPcNvwLmh+Ox+hRBSPyewUDB4RZ4MFplyJ00M7csxNUWEeJKSX uj2IaaZl93PQTyrRGUbfu9NcruTlbPVkkDXjZBrEEIOpoPYpQAWDjw74fDwmYa3O5TX3 W1c61pj9dvAxfJJAv9mUl0n+etDp5W78LjaaFS1g2he35z7miIutDij+qKhI5JXnvNdK tWunaIDskZzpozDSZjG1LVNDOG1xlc3vFbahu4U5Obs2jxR5nUGfBTynRG6QK+CTSLpe uD/YMSQHEobjNK4JRnAKY+NSXrvkb3DFNbBHoo7IK6X9TDaSs5yGeA9YBSm4AUN6j+Fh l+DA== 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:in-reply-to :references; bh=Sv5npA99HW6kdcMPlrXCf9qbYo14Z5xEJsn2NB1sl1g=; b=q+CReYIXuWzQZ/pw2vNSb+BeVP88Gib4hCRXtQ3qyUXE9mDOVRbNnSyVdORH3/VkOg VAfWcRMYNQYHdErT0CYaw+RcadxKWQdiz3rrwpPYS33yVyBvysH02fR6+GvSnz02Z7GW H0OwqNFIBaDLnZWu8/8frSLzOHFEDm8u827AgEHz1JcsQ4h49917ryCKrtMRbr2hJ99D 9Qw2+RwW5IIVUsolKICy95MVpfIyAs1gJt0NaVQpm1arpujoo9AiMcMn8Qnt0xJWS/UJ d1veRa5Ai1d7M5xglF9z+nZoPz/WwPBREBiqSy15skGMHhLKg6iNhMSslXgBcC0oo1gL clYw== X-Gm-Message-State: ALKqPwfEEUW7jdgw47dZznKJskLuqtXrK+OEQp7umYZPiQfU4AWN47E7 u7ckdrLYl2+8mb1D2jMz1YfOXmvTnV4= X-Google-Smtp-Source: AB8JxZr0tqVlhzS42IY/mZSTYtEC8TkbGumcqoIdvEHd3qlGaGp48QAIoervQCQbEgvewWmLxJZ6BA== X-Received: by 2002:a17:902:20e8:: with SMTP id v37-v6mr5631002plg.354.1526419184768; Tue, 15 May 2018 14:19:44 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id j5-v6sm1323362pfe.119.2018.05.15.14.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 14:19:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 15 May 2018 14:19:34 -0700 Message-Id: <20180515211934.7651-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515211934.7651-1-stephen@networkplumber.org> References: <20180515211934.7651-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v8 5/5] bus/vmbus and net/netvsc: add meson build support 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" From: Stephen Hemminger Update meson build files for new netvsc and vmbus drivers. Signed-off-by: Stephen Hemminger --- config/meson.build | 7 +++++++ drivers/bus/meson.build | 2 +- drivers/bus/vmbus/meson.build | 16 ++++++++++++++++ drivers/net/meson.build | 2 +- drivers/net/netvsc/meson.build | 13 +++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 drivers/bus/vmbus/meson.build create mode 100644 drivers/net/netvsc/meson.build diff --git a/config/meson.build b/config/meson.build index 2179c689c14d..34759d505881 100644 --- a/config/meson.build +++ b/config/meson.build @@ -50,6 +50,13 @@ if host_machine.system() == 'linux' and cc.find_library('bsd', dpdk_extra_ldflags += '-lbsd' endif +# vmbus depends on lib uuid +uuid_dep = cc.find_library('uuid', required: false) +if uuid_dep.found() and cc.has_header('uuid/uuid.h') + add_project_link_arguments('-luuid', language: 'c') + dpdk_extra_ldflags += '-luuid' +endif + # add -include rte_config to cflags add_project_arguments('-include', 'rte_config.h', language: 'c') diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index 52c755dcfd8e..80de2d91d52d 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev'] +drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus'] std_deps = ['eal'] config_flag_fmt = 'RTE_LIBRTE_@0@_BUS' driver_name_fmt = 'rte_bus_@0@' diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build new file mode 100644 index 000000000000..8a17be828a32 --- /dev/null +++ b/drivers/bus/vmbus/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause + +install_headers('rte_bus_vmbus.h','rte_vmbus_reg.h') + +sources = files('vmbus_common.c', + 'vmbus_channel.c', + 'vmbus_bufring.c', + 'vmbus_common_uio.c') + +if host_machine.system() == 'linux' + sources += files('linux/vmbus_bus.c', + 'linux/vmbus_uio.c') + includes += include_directories('linux') +else + build = false +endif diff --git a/drivers/net/meson.build b/drivers/net/meson.build index b7d00a04c8ef..74d6c0f7cabf 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,7 +3,7 @@ drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', - 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', + 'mvpp2', 'netvsc', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build new file mode 100644 index 000000000000..44926b20e973 --- /dev/null +++ b/drivers/net/netvsc/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Microsoft Corporation + +version = 2 + +allow_experimental_apis = true + +sources = files('hn_ethdev.c', + 'hn_rxtx.c', + 'hn_rndis.c', + 'hn_nvs.c') + +deps += ['bus_vmbus' ]