From patchwork Thu Apr 26 22:57:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 39067 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 85868AABA; Fri, 27 Apr 2018 00:57:52 +0200 (CEST) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by dpdk.org (Postfix) with ESMTP id 9882C8E74 for ; Fri, 27 Apr 2018 00:57:45 +0200 (CEST) Received: by mail-pf0-f195.google.com with SMTP id v63so9925563pfk.8 for ; Thu, 26 Apr 2018 15:57:45 -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=Lo833Myxad59WZI2Qgy+COHQ2CrABdwdGrARNBSd77Q=; b=SoQzMoAZBqDalV+Q9l9x8l0ygWBlu2uEVNIlKBxPAzr2FkWAd0KluWFVUp9ooUu1gh 6Lrp6w9U55Y+qSjXL4PN0lU5Ku/NI1EC9ZOIF+n7sgxdDFxCwu/YZWARspHjXtKIn5bm dotzF0bXtGbr9t1biwopAEuKT5eXx+Zd1PbUp+PkOGLHBwJqlbLFI52j2UJ90zprUSY4 QKMeWvDFhUbCl8BbjN3GQ+3X7KGMITpgJYUaKP5J+PKm41+oF757K4RnULNrHA+hsp7t 35Gdkm7+ThmE1AVRt4F82fnUJ+KAFePHSPtHnTii7H6VH5aEHqluP5LiETSngYvIpq/4 L+Vw== 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=Lo833Myxad59WZI2Qgy+COHQ2CrABdwdGrARNBSd77Q=; b=eLem1Bfd2Nj2DusgRuMKQRK45mVwW2BHk4cJmVe8bCkX+GfqJz9E8iilyzoR2aEsCS FyRR7Rp8IqZzPQ9xKyvllrCQVMHFn4yg5WBxy7Srs6aJti+YV4coFrpkyW5xQlVZtTjK VckH4Se0/QpPcmYXUavyeH/Jn1n2NYDxlEmdvE6SSdUwK/7AnJ7BlNNGwE1qZVR2jHAu bk9LCqMZETV8og48/Md0gGyr1xyAdtCs576qqADiLwwBNTfSUDueKKsHi6c71MEriyf/ xKTC46FfRiSRbr3KCvAQ7CfczdxeODgKR/iO3XKTGKuFXTGajhfKgiJBNZw9VFcDEuQ/ 5UlA== X-Gm-Message-State: ALQs6tAW/uROe+tBU4L7MFH1Fgkz+siXHRtonD2StJ8Z/9zus94MQLSa CK9PvRkknsj3DLB2mQRvo0ejPshnxT8= X-Google-Smtp-Source: AIpwx4/3zxqqVTVXQ93vpp2qyjFrz6uy27jRk/9uA2oXENMQSOD+lnQnainkTg53wKMzz8lyEk2m+g== X-Received: by 2002:a17:902:8a81:: with SMTP id p1-v6mr36924715plo.183.1524783464180; Thu, 26 Apr 2018 15:57:44 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id e4sm41667791pfa.128.2018.04.26.15.57.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 15:57:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 26 Apr 2018 15:57:36 -0700 Message-Id: <20180426225736.20295-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180426225736.20295-1-stephen@networkplumber.org> References: <20180426225736.20295-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v5 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" 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 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' ]