All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Subject: [PATCH v4 4/4] bus/vmbus and net/netvsc: add meson build support
Date: Wed, 18 Apr 2018 10:56:41 -0700	[thread overview]
Message-ID: <20180418175641.24051-5-sthemmin@microsoft.com> (raw)
In-Reply-To: <20180418175641.24051-1-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 77af5d897da2..a14213b86818 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -45,6 +45,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 b7cac4a4a1f5..513c9d9e55c6 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',
-	'null', 'octeontx', 'pcap', 'ring',
+	'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

  parent reply	other threads:[~2018-04-18 18:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-18 17:56 [PATCH v4 0/4] Hyper-V Netvsc PMD (and VMBus) Stephen Hemminger
2018-04-18 17:56 ` [PATCH v4 1/4] bus/vmbus: add hyper-v virtual bus support Stephen Hemminger
2018-04-18 17:56 ` [PATCH v4 2/4] net/netvsc: add hyper-v netvsc network device Stephen Hemminger
2018-04-18 17:56 ` [PATCH v4 3/4] net/netvsc: add documentation Stephen Hemminger
2018-04-18 17:56 ` Stephen Hemminger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-09  0:26 [PATCH v6 0/4] Hyper-V netvsc PMD and VMBus support Stephen Hemminger
2018-05-09  0:26 ` [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=20180418175641.24051-5-sthemmin@microsoft.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.