From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F384DA04A3 for ; Fri, 5 Jun 2020 20:27:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E94AD1D514; Fri, 5 Jun 2020 20:27:57 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 9E7091D514 for ; Fri, 5 Jun 2020 20:27:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Lc9tP322ea/JfdEQ95QtE3YAMg6OS1xirqK9W3h2fQ=; b=EIioEHtr3COxhGZsh9sTBbGKb0qi/t9PPW6S53ZSZoBZGigGTYnNe+XqU2DgrvQU/bYu1W HvvVJzeSWgUT0wbCE3RT+vNG9sL20mQXdd7WKoPhgl0tAl7sEWUYttQ+rWdSeqZ085BwLV Dat8YylLe+denpTPaaSq+ZY0NVhEPQ4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-9QUrVd9SMOuHrhChU0vDOg-1; Fri, 05 Jun 2020 14:27:52 -0400 X-MC-Unique: 9QUrVd9SMOuHrhChU0vDOg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 792C6107ACCA; Fri, 5 Jun 2020 18:27:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AC6D60E1C; Fri, 5 Jun 2020 18:27:50 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: David Marchand , Kevin Traynor , dpdk stable Date: Fri, 5 Jun 2020 19:25:13 +0100 Message-Id: <20200605182525.22483-76-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' has been queued to LTS release 18.11.9 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7578d9d656905098a08a9ba47faca674f9504cf0 Thanks. Kevin. --- >From 7578d9d656905098a08a9ba47faca674f9504cf0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 May 2020 10:10:50 +0200 Subject: [PATCH] examples/vm_power: drop Unix path limit redefinition [ upstream commit 666272d20da3deb1fb41051b9f91a46a8363f2b0 ] The Unix socket path may be as long as UNIX_PATH_MAX. This constant is supposed to be defined in sys/un.h. On Linux, it appears to be in linux/un.h. This constant was re-defined locally, based on a variable declaration. It is breaking compilation with -fno-common (default in GCC 10) We could avoid the variable declaration by using NULL struct, but it looks simpler not redefining this system constant. As the power library and its examples are restricted to Linux only, the Linux header file is directly included. Fixes: 0d74597c1b4f ("examples/vm_power: fix max length of unix socket path") Signed-off-by: Thomas Monjalon Acked-by: David Marchand Acked-by: Kevin Traynor --- examples/vm_power_manager/channel_manager.c | 1 - examples/vm_power_manager/channel_manager.h | 6 +----- examples/vm_power_manager/power_manager.c | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 4fac099dfd..8aabd69c40 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -5,5 +5,4 @@ #include #include -#include #include #include diff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h index d948b304c4..22905266f8 100644 --- a/examples/vm_power_manager/channel_manager.h +++ b/examples/vm_power_manager/channel_manager.h @@ -11,5 +11,5 @@ extern "C" { #include -#include +#include #include @@ -33,8 +33,4 @@ extern "C" { #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" -#ifndef UNIX_PATH_MAX -struct sockaddr_un _sockaddr_un; -#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path) -#endif #define MAX_CLIENTS 64 diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c index a7e98cf40b..ecdf9a5583 100644 --- a/examples/vm_power_manager/power_manager.c +++ b/examples/vm_power_manager/power_manager.c @@ -7,5 +7,4 @@ #include #include -#include #include #include -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.992471597 +0100 +++ 0076-examples-vm_power-drop-Unix-path-limit-redefinition.patch 2020-06-05 19:20:50.980036951 +0100 @@ -1 +1 @@ -From 666272d20da3deb1fb41051b9f91a46a8363f2b0 Mon Sep 17 00:00:00 2001 +From 7578d9d656905098a08a9ba47faca674f9504cf0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 666272d20da3deb1fb41051b9f91a46a8363f2b0 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ - examples/vm_power_manager/channel_manager.h | 7 +------ + examples/vm_power_manager/channel_manager.h | 6 +----- @@ -28 +29 @@ - 3 files changed, 1 insertion(+), 8 deletions(-) + 3 files changed, 1 insertion(+), 7 deletions(-) @@ -31 +32 @@ -index 4d13697208..74a2a677e8 100644 +index 4fac099dfd..8aabd69c40 100644 @@ -41 +42 @@ -index a2a2f2bba0..e55376fcdb 100644 +index d948b304c4..22905266f8 100644 @@ -50,3 +51,3 @@ - #include -@@ -27,9 +27,4 @@ extern "C" { - #define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" + +@@ -33,8 +33,4 @@ extern "C" { + #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" @@ -58 +59 @@ -- + @@ -60 +60,0 @@ - #define MAX_VCPUS 20 @@ -62 +62 @@ -index 7b4f4b3c4d..cd51d4741f 100644 +index a7e98cf40b..ecdf9a5583 100644