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 C4EF3A0093 for ; Tue, 19 May 2020 14:58:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB2E51D610; Tue, 19 May 2020 14:58:36 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 77DBC1C1E4 for ; Tue, 19 May 2020 14:58:35 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id 50so15753481wrc.11 for ; Tue, 19 May 2020 05:58:35 -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=jaDuZ0Wfvzvy347opBIj4rtc0iloV8gzTXYst0oP+Sw=; b=twKdxxe+sX0J8PdcAIVphOj8V69NSwQ7Dt9Rm+jHt5twYADzkoOIZxq+G4h6UftciA QUgdmhHFhmEkYfZadPalU+qtFGS45y93yCgkbfCIMswdCLXdfYAo8FyOAJ4vtjGJDOd7 bAGA+TXqeLL6gthcDh1Lk4dvPXMixQvqxzMyTfvUDnKpdA9oLlYaJYeP2pbzMD5HJZde kRq13NEhG2soLfchcWX+LCUaOawjvQnCixic3kNvjB5XNORr2HjqznwRXx5trP5UorQl bTL4XdjDMIsnmd4CdgImdMiDPHTu7FuyXf0gx0GR4Ih8ZmSq2irks875jbc6Q2VzXAPe gjPQ== 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=jaDuZ0Wfvzvy347opBIj4rtc0iloV8gzTXYst0oP+Sw=; b=aM3fxMaAah2nBbC1ojSfdICLnI/iulmWx7ce1vA2HkAgkwJrTeU31JN3SHSBUhBJrU xzuHj+pDWX9ilA89IGAHhsDTnIXRxXo3NAsQRwTIO9RMJU1QatSGsyhwqIOu3h5dxka1 0/ZB+XGgxUwmj92idOXTHkzg6JJyj4U4CcGGQ7/e7XnR0w53/lqxqqQcelt4TyHNE3xF lBHbJlkqPJ6Csl8UiXuepv7mcofRpvZgc/ZgAzp1e26wGcvMyj9rFLt31d/z/zWJgPBx fWAwEiJQXuHHpLqTaLC+Qa3kK9lVHNeSinItDkI2OIvEZSuCsBzXU1pjuH2Tymcykman PtaQ== X-Gm-Message-State: AOAM532mdm6k/zsDXSNd7BCelWIW9x+HHRZV1uK4t1NeTzcnmliWACiP BWrTwQXb0AXToR/3/+3vH6k= X-Google-Smtp-Source: ABdhPJwYjy+hz6WTpGlxVNOKzDR2JK5JpzXlY2JJGlLWk5VHcdxotE8J2VXnNFb4t4qt8cjhyr+awg== X-Received: by 2002:adf:fac4:: with SMTP id a4mr24522996wrs.134.1589893115189; Tue, 19 May 2020 05:58:35 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x5sm21988914wro.12.2020.05.19.05.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Timothy Redaelli Cc: Maxime Coquelin , David Marchand , dpdk stable Date: Tue, 19 May 2020 13:53:14 +0100 Message-Id: <20200519125804.104349-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/vhost_blk: fix build with gcc 10' 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/21/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 84119ecce20a58c4fb23a79dee9bffb9d3ecf298 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 14:47:03 +0100 Subject: [PATCH] examples/vhost_blk: fix build with gcc 10 [ upstream commit be848992298b7a64a161487600a4070e52b9d26d ] GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: c19beb3f38cd ("examples/vhost_blk: introduce vhost storage sample") Signed-off-by: Timothy Redaelli Reviewed-by: Maxime Coquelin Acked-by: David Marchand --- examples/vhost_blk/vhost_blk.c | 2 ++ examples/vhost_blk/vhost_blk.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c index 74c82a900b..b757c9228b 100644 --- a/examples/vhost_blk/vhost_blk.c +++ b/examples/vhost_blk/vhost_blk.c @@ -31,6 +31,8 @@ (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) +struct vhost_blk_ctrlr *g_vhost_ctrlr; + /* Path to folder where character device will be created. Can be set by user. */ static char dev_pathname[PATH_MAX] = ""; static sem_t exit_sem; diff --git a/examples/vhost_blk/vhost_blk.h b/examples/vhost_blk/vhost_blk.h index 933e2b7c57..17258d284b 100644 --- a/examples/vhost_blk/vhost_blk.h +++ b/examples/vhost_blk/vhost_blk.h @@ -112,8 +112,8 @@ struct inflight_blk_task { struct rte_vhost_inflight_info_packed *inflight_packed; }; -struct vhost_blk_ctrlr *g_vhost_ctrlr; -struct vhost_device_ops vhost_blk_device_ops; +extern struct vhost_blk_ctrlr *g_vhost_ctrlr; +extern struct vhost_device_ops vhost_blk_device_ops; int vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev, struct vhost_blk_task *task); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.022980419 +0100 +++ 0004-examples-vhost_blk-fix-build-with-gcc-10.patch 2020-05-19 13:56:18.171500955 +0100 @@ -1,14 +1,15 @@ -From be848992298b7a64a161487600a4070e52b9d26d Mon Sep 17 00:00:00 2001 +From 84119ecce20a58c4fb23a79dee9bffb9d3ecf298 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 14:47:03 +0100 Subject: [PATCH] examples/vhost_blk: fix build with gcc 10 +[ upstream commit be848992298b7a64a161487600a4070e52b9d26d ] + GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: c19beb3f38cd ("examples/vhost_blk: introduce vhost storage sample") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Reviewed-by: Maxime Coquelin