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 0E49CA04A4 for ; Wed, 27 May 2020 11:24:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C73CE1D65D; Wed, 27 May 2020 11:24:37 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 102E81D654 for ; Wed, 27 May 2020 11:24:36 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id u12so2328567wmd.3 for ; Wed, 27 May 2020 02:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6Oer7Oech8y2iz66rJ8PvWacSy+D3WQQ45YKNBBWz6g=; b=G3t630xlYoGh0xtVb0oqrFkG3e2S/fB6gdqPAanx5xodY4B54fyWQN1r8Xpdngyg6t GlumjBv/dDGCA7ErRDXvp8r1mZWrSBP4cSLkBTZi5QNVzK1RaEa9do3qbkI7+ZWpkbC+ 20YWcB7N3/kxcl4yyk3K10lGHPLWSC8Mg5t4hbTIesQKrboK9+tm70AVFej7Ejach3DU gQr9/mGXa+MSD9NrS9ZNMN2jUoZwLtxjQ7p2ajz27lWPllK3m0Xp9mqQ5Ul6/SG+pnsl lp0GDA4PzCcG8HriUOmi9FU4u3mBsc5gmiC0LmTBnykDwBez+7sn1SxskMQc0+sW/nOQ TthA== 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:mime-version:content-transfer-encoding; bh=6Oer7Oech8y2iz66rJ8PvWacSy+D3WQQ45YKNBBWz6g=; b=Llj9XD/AMBWsWNwpDZ5Pgl3Yw4iX1KY8wGW90b1NV8vubgeplaNwvVle0g2Ak7hWPi ksIWSGC6N26KDyKS82ppwHxMvh+U7Lt3HOgCwM6/p4MHe4kDSg+X8FDl2eZfOmRDVyJx +ICudi16E+BoVxgUkIgcvXGl3irrwO3lErNdEDHBMV1w3IgbJ7zn63sdV14uyTWNbZPO CQGr/wsTrWFzXPg2t0UnJULDQfRo/IQ2qAI7RY+DaLmsHdbQYpKe5tl2Sf1DfEzPeLJ1 9RvfT7/hIYPch3HuJrLVJx1IkoNOHc+wPtQHjD9rRKSXSJiYoFMPQhkO+WmAs8kqFz9A pWUQ== X-Gm-Message-State: AOAM531l/VLFowO3WZH8ABjHDQvklxqvW920xGq6x9E1XCe42VFtikTn ulyfsGEVTGW1E5RONK0UaYV8VZPVaLk= X-Google-Smtp-Source: ABdhPJyNlUTTW9Q0CXE85QPnpJBgb84IJsEeC6/zsCpxCoSg354nD/T1B5EzyDaf5UBqJqoTtmUjEw== X-Received: by 2002:a7b:c311:: with SMTP id k17mr3312348wmj.148.1590571475737; Wed, 27 May 2020 02:24:35 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h196sm2230920wme.22.2020.05.27.02.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: David Marchand , Kevin Traynor , dpdk stable Date: Wed, 27 May 2020 10:24:06 +0100 Message-Id: <20200527092422.258652-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/29/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. Thanks. Luca Boccassi --- >From 121f7527868fca5a3e2788a1f3a79ffa9920a136 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 | 7 +------ examples/vm_power_manager/power_manager.c | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 4d13697208..74a2a677e8 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h index a2a2f2bba0..e55376fcdb 100644 --- a/examples/vm_power_manager/channel_manager.h +++ b/examples/vm_power_manager/channel_manager.h @@ -10,7 +10,7 @@ extern "C" { #endif #include -#include +#include #include #include @@ -26,11 +26,6 @@ extern "C" { /* FIFO file name template */ #define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" -#ifndef UNIX_PATH_MAX -struct sockaddr_un _sockaddr_un; -#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path) -#endif - #define MAX_CLIENTS 64 #define MAX_VCPUS 20 diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c index 7b4f4b3c4d..cd51d4741f 100644 --- a/examples/vm_power_manager/power_manager.c +++ b/examples/vm_power_manager/power_manager.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.756323216 +0100 +++ 0003-examples-vm_power-drop-Unix-path-limit-redefinition.patch 2020-05-27 10:23:31.623933682 +0100 @@ -1,8 +1,10 @@ -From 666272d20da3deb1fb41051b9f91a46a8363f2b0 Mon Sep 17 00:00:00 2001 +From 121f7527868fca5a3e2788a1f3a79ffa9920a136 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. @@ -16,7 +18,6 @@ the Linux header file is directly included. Fixes: 0d74597c1b4f ("examples/vm_power: fix max length of unix socket path") -Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: David Marchand