From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Subject: [dpdk-dev] [PATCH v4 4/4] bus/vmbus and net/netvsc: add meson build support
Date: Tue, 8 May 2018 17:26:05 -0700 [thread overview]
Message-ID: <20180509002605.30996-5-stephen@networkplumber.org> (raw)
In-Reply-To: <20180509002605.30996-1-stephen@networkplumber.org>
From: Stephen Hemminger <sthemmin@microsoft.com>
Update meson build files for new netvsc and vmbus drivers.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
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 5815b56021b1..9900157143e1 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -49,6 +49,13 @@ if host_machine.system() == 'linux' and cc.find_library('bsd', required: false).
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 58dfbe2b24dd..720eecef0577 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', 'pci', 'vdev']
+drivers = ['dpaa', 'fslmc', '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' ]
--
2.17.0
next prev parent reply other threads:[~2018-05-09 0:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 0:26 [dpdk-dev] [PATCH v6 0/4] Hyper-V netvsc PMD and VMBus support Stephen Hemminger
2018-05-09 0:26 ` [dpdk-dev] [PATCH v6 1/4] bus/vmbus: add hyper-v virtual bus support Stephen Hemminger
2018-05-09 0:26 ` [dpdk-dev] [PATCH v6 2/4] net/netvsc: add hyper-v netvsc network device Stephen Hemminger
2018-05-09 0:26 ` [dpdk-dev] [PATCH v6 3/4] net/netvsc: add documentation Stephen Hemminger
2018-05-09 15:57 ` Kovacevic, Marko
2018-05-09 0:26 ` Stephen Hemminger [this message]
2018-05-11 16:50 ` [dpdk-dev] [PATCH v6 0/4] Hyper-V netvsc PMD and VMBus support Ferruh Yigit
2018-05-11 17:38 ` Stephen Hemminger
2018-05-12 22:02 ` Thomas Monjalon
2018-05-13 17:22 ` Stephen Hemminger
-- strict thread matches above, loose matches on Subject: below --
2018-04-18 17:56 [dpdk-dev] [PATCH v4 0/4] Hyper-V Netvsc PMD (and VMBus) Stephen Hemminger
2018-04-18 17:56 ` [dpdk-dev] [PATCH v4 4/4] bus/vmbus and net/netvsc: add meson build support Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180509002605.30996-5-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=sthemmin@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).