From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 25FF05688 for ; Tue, 20 Nov 2018 20:15:19 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8BA0AC0495A3; Tue, 20 Nov 2018 19:15:18 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FF47600C3; Tue, 20 Nov 2018 19:15:17 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: Bruce Richardson , dpdk stable Date: Tue, 20 Nov 2018 19:12:28 +0000 Message-Id: <20181120191252.30277-38-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 20 Nov 2018 19:15:18 +0000 (UTC) Subject: [dpdk-stable] patch 'eal: include missing hypervisor files in meson' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:15:19 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From e541d3195cc60682116bcbadf185bf8cb0807c0f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 17 Sep 2018 10:01:24 +0100 Subject: [PATCH] eal: include missing hypervisor files in meson [ upstream commit 888904417d396a4b10ff673588b68b7e6ccccf64 ] They are built by the legacy makefiles but not by Meson. Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name") Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- lib/librte_eal/common/arch/arm/meson.build | 2 +- lib/librte_eal/common/arch/x86/meson.build | 2 +- lib/librte_eal/common/meson.build | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build index c6bd92272..79731e1a2 100644 --- a/lib/librte_eal/common/arch/arm/meson.build +++ b/lib/librte_eal/common/arch/arm/meson.build @@ -3,3 +3,3 @@ eal_common_arch_sources = files('rte_cpuflags.c', - 'rte_cycles.c') + 'rte_cycles.c', 'rte_hypervisor.c') diff --git a/lib/librte_eal/common/arch/x86/meson.build b/lib/librte_eal/common/arch/x86/meson.build index 4e0f77900..14bf204c6 100644 --- a/lib/librte_eal/common/arch/x86/meson.build +++ b/lib/librte_eal/common/arch/x86/meson.build @@ -3,3 +3,3 @@ eal_common_arch_sources = files('rte_spinlock.c', 'rte_cpuflags.c', - 'rte_cycles.c') + 'rte_cycles.c', 'rte_hypervisor.c') diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index 56005bea8..b7fc98499 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -15,4 +15,5 @@ common_sources = files( 'eal_common_fbarray.c', 'eal_common_hexdump.c', + 'eal_common_hypervisor.c', 'eal_common_launch.c', 'eal_common_lcore.c', @@ -60,4 +61,5 @@ common_headers = files( 'include/rte_fbarray.h', 'include/rte_hexdump.h', + 'include/rte_hypervisor.h', 'include/rte_interrupts.h', 'include/rte_keepalive.h', -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.376310190 +0000 +++ 0038-eal-include-missing-hypervisor-files-in-meson.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,12 +1,13 @@ -From 888904417d396a4b10ff673588b68b7e6ccccf64 Mon Sep 17 00:00:00 2001 +From e541d3195cc60682116bcbadf185bf8cb0807c0f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 17 Sep 2018 10:01:24 +0100 Subject: [PATCH] eal: include missing hypervisor files in meson +[ upstream commit 888904417d396a4b10ff673588b68b7e6ccccf64 ] + They are built by the legacy makefiles but not by Meson. Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name") -Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson