From patchwork Wed Apr 18 17:56:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 38433 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 AA8E17D0B; Wed, 18 Apr 2018 20:05:24 +0200 (CEST) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by dpdk.org (Postfix) with ESMTP id 9552F7CEF for ; Wed, 18 Apr 2018 20:05:20 +0200 (CEST) Received: by mail-pl0-f66.google.com with SMTP id k9-v6so1570074pll.12 for ; Wed, 18 Apr 2018 11:05:20 -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=SNJ1Ina06VJ1YRwE1ge0FsnMIX3aPRJQagjoDYttwAk=; b=FV/wHYNmwn79ADitT+DKfCCfqjAdH3JFdDbDS4hpji5NoY07UuuPg5YTmF0aUp9Pmf 8/mL5aDWo3OvVLRvSSZgJGq8gKaYFUh9arlBJJ1Dy7AF1wKV6XNEsVdPbwvCEYWMU8C+ q3c08biVtaktn54/GjHCV6gVwP65f1hV6qlZrLpgcozH9EtqEOXVkDMnF73PRZCH1RtC xXDtRk73o2RBbHD1CXYoQ8XWeYGYfkTywzE5f9TVdL31GmTy6OupNFrbbRsOW4VygCal zrPk7w8R02TALdK1nQaYTRAiUfg/QSvQrch3uY689Px8+XyGssH3EuuA/gf7RW3O5Fbn cDUQ== 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=SNJ1Ina06VJ1YRwE1ge0FsnMIX3aPRJQagjoDYttwAk=; b=N/NCWdDrNlryLz4JpXd+hG9q1YZIxTkjwZmvj4hoNH5CnWaZCrbFNOQpkgtGpJiVAG rovov+RTczaIveA3YaRtJCNSEXEPGpcYodr9VyX+i8qgbBSTnevDULxnGjowu55z4B/g ShC0i+BZWtAojo0HSM6iSJZOX9sInnE4nB7LGBu2XWExQ/W1s6MH6rO00KWm6uU7Ii/4 RF5Whp/r0cme1inpyRW9dkaN6F4VTD+y5worMqcIRQOjPx6LvJwg6MP67wasZRlWlViu QdS6SzJKNbr2OL+M4sB3ksyMisBb4Pwoox9aqtz6Klg28nmc3fgIuiABvzqjhBbN6zQz vtaw== X-Gm-Message-State: ALQs6tAE/KUnOtiBaVR/gye8FdZ+LDhkVe6Bx1k+XFCpMEtnEFg23kbi swdTFYFQauKbhR/u3nlvSYsrwU5UtfA= X-Google-Smtp-Source: AIpwx48IXkWTopaRpvtE2/b2JLupC5clEssMmQq2wr/wEniLrNsbnjbDo6e1Dnn9T2pq0zecIH8+jA== X-Received: by 2002:a17:902:3001:: with SMTP id u1-v6mr2986008plb.164.1524074719148; Wed, 18 Apr 2018 11:05:19 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id w10sm5259507pfk.26.2018.04.18.11.05.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 11:05:18 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 18 Apr 2018 10:56:41 -0700 Message-Id: <20180418175641.24051-5-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180418175641.24051-1-sthemmin@microsoft.com> References: <20180418175641.24051-1-sthemmin@microsoft.com> Subject: [dpdk-dev] [PATCH v4 4/4] 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" 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 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' ]