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 D032EA04A4 for ; Wed, 27 May 2020 11:24:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B862B1D654; 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 D0BEA1D645 for ; Wed, 27 May 2020 11:24:34 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id u12so2328520wmd.3 for ; Wed, 27 May 2020 02:24:34 -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=i6mBxIp/7pZ/A4Fbw2kafwRk0mumzMg+CmRgbyLPmGo=; b=pqGkpInCE83dxduaP5fcymN3dk+mRJxUQpdDsw92LrXCByzkfwznr0M9+oEJ9pGGBE bcpvDe4KASPO3qGEP6/b0i8YjRaPsXwc9ejjMxdxIRxXN/QAFL5CybJ9sd6igONnApVw T/mkLsmnWig/O3NtrAwUyb/2g1TR+F1fi2HautyYM5DdE1gCmIvvCOJSDWzj47JnBfQb Sy62KwHewgEdw5a1z9f8GiWihwifAGAbmZ6sJWB2nHcRL7bZ9YO+5IPwW4VDPvnQGvut iKg0jG2wCm6IKUyIg7MKQRIEdiJGZ9JZjGJuXlIP7SCui1fkBWYui51UqsijeFw2ypSi VUzg== 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=i6mBxIp/7pZ/A4Fbw2kafwRk0mumzMg+CmRgbyLPmGo=; b=tKkksNkzVezfmXtnz2zDY4JoHCOjUCzcw157JNZxqXKq1TrnavMvTQS2b6hQZnfc4+ 7Jywnop3irT6yfe4eRULo67LhvLDgRxXuTxn7CZSDApYle3mZgprbHOKru/IxFFMMcy0 1wXzcVEI++jrReVMafxHRV4fePcTQxhBg6t5xW45LpRIJ52CLG1q5oWbWl/FqSzq1Tsu NMrlk9SgXqC8IS6I5QpYte+pPnvtaZtp5Lc+o3Lb2mJEM2EGW5tX417Uo8+3rZybbY9c ynyPj3fg48czVnAHRKKNebmUjDwRUFlhDYrakWW68vIPZribLkppXyT/skzFtEtgyYLs NpPQ== X-Gm-Message-State: AOAM533PpfTPm2kTriNG1/Co4ogXvh3cWnXApjDW+H3Ev09XGp7bOTVS YbFMvF4G/b4cS6YeZvCvL30= X-Google-Smtp-Source: ABdhPJyJJWx7xhuCU+QyhusnvJh/81XGF/jwmE3f0irml15wcstm7Li8gb59d4a/dGwzzhyu53q/gQ== X-Received: by 2002:a7b:c149:: with SMTP id z9mr3278337wmi.57.1590571474528; Wed, 27 May 2020 02:24:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v2sm2312753wrn.21.2020.05.27.02.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: David Marchand , Kevin Traynor , dpdk stable Date: Wed, 27 May 2020 10:24:05 +0100 Message-Id: <20200527092422.258652-2-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: fix build with -fno-common' 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 ba5df75ed5ea04c8e0f357854ba78ce7d4d49ab3 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 May 2020 09:59:35 +0200 Subject: [PATCH] examples/vm_power: fix build with -fno-common [ upstream commit 96d3d532f9f2e42cf8b620ad3ba9da1f04ccb3f0 ] The variables of the same name are merged together if compiled with -fcommon. It used to be the default. This default behaviour allows to declare a variable in a header file and share the variable in every .o binaries thanks to merge at link-time. If compiling with -fno-common (default in GCC 10), the variable must be shared as extern to avoid multiple re-definitions. Fixes: dff22404aaad ("examples/vm_power_mgr: add VCPU to PCPU mapping") Signed-off-by: Thomas Monjalon Acked-by: David Marchand Acked-by: Kevin Traynor --- examples/vm_power_manager/channel_manager.c | 2 ++ examples/vm_power_manager/channel_manager.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 4ac21f02c1..4d13697208 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -35,6 +35,8 @@ #define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1 +struct libvirt_vm_info lvm_info[MAX_CLIENTS]; + /* Global pointer to libvirt connection */ static virConnectPtr global_vir_conn_ptr; diff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h index 8284be0a18..a2a2f2bba0 100644 --- a/examples/vm_power_manager/channel_manager.h +++ b/examples/vm_power_manager/channel_manager.h @@ -41,7 +41,7 @@ struct libvirt_vm_info { uint8_t num_cpus; }; -struct libvirt_vm_info lvm_info[MAX_CLIENTS]; +extern struct libvirt_vm_info lvm_info[MAX_CLIENTS]; /* Communication Channel Status */ enum channel_status { CHANNEL_MGR_CHANNEL_DISCONNECTED = 0, CHANNEL_MGR_CHANNEL_CONNECTED, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.723733670 +0100 +++ 0002-examples-vm_power-fix-build-with-fno-common.patch 2020-05-27 10:23:31.619933644 +0100 @@ -1,8 +1,10 @@ -From 96d3d532f9f2e42cf8b620ad3ba9da1f04ccb3f0 Mon Sep 17 00:00:00 2001 +From ba5df75ed5ea04c8e0f357854ba78ce7d4d49ab3 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 May 2020 09:59:35 +0200 Subject: [PATCH] examples/vm_power: fix build with -fno-common +[ upstream commit 96d3d532f9f2e42cf8b620ad3ba9da1f04ccb3f0 ] + The variables of the same name are merged together if compiled with -fcommon. It used to be the default. This default behaviour allows to declare a variable in a header file and @@ -12,7 +14,6 @@ shared as extern to avoid multiple re-definitions. Fixes: dff22404aaad ("examples/vm_power_mgr: add VCPU to PCPU mapping") -Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: David Marchand