From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59B3FA0032 for ; Fri, 18 Feb 2022 13:44:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5494340141; Fri, 18 Feb 2022 13:44:53 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 08F8840141 for ; Fri, 18 Feb 2022 13:44:52 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id x3-20020a05600c21c300b0037c01ad715bso6340643wmj.2 for ; Fri, 18 Feb 2022 04:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Se9idByPaU+mNJJW4GN0D2Os9uddGQKLWMxMFOW4+Wc=; b=P+kYfwrdlxEASzeXxHY3Y63mTMWJ+fVzOQsW9kv24SUcFY1+ht6P9Rc+yXNnqzNj83 krVLIKYQD9FBViiUn4a4FXi31Qcmol/FKDsZuoTPKEqywOo/4AYomFwhH1KbsKdkdusx 81o90zfQcx4WptsmBMu+S6aQtrbTRlP5ICFpMr3//wFx0TQPG5gM0qisNsAfLdRbKR4D U6/iFymVyR99i56bkRqO5pHlIhdaFGMsa5a5tfTUODuPu6qmmsuJJQpAKgHenWPuUm9I BmTqM3oYUegpdZxiXI7l371kdsv7Sl6P8s4MPa0NjjmPAFPqqrqkH5CmgjDhcdWHDyES BOfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Se9idByPaU+mNJJW4GN0D2Os9uddGQKLWMxMFOW4+Wc=; b=wV7r2fh/WeoBHXpXlIYSG1eeOGnzScxJ32BxhcU8lBQe6NzNDwD3WJz8KG5LKX+3UQ xFx0U2zDRCy/Vag52QaBOcsXnMRJJS3etLHy2O3RsyMbibmsyOMSIlBWjIUsnWr3kq36 FbUNkv//cuxZl1mHQcIQfXsrvemuqJ35qakNI9cTEcorNzSq2tEZd66DJc8WMzENrJgJ DA7zSriOocj8Pj2xnizS22W+uxAVcxG+f1OGU/AAk+kvwKGRCagm9ktqGdZo4kjWFbcu CNsCnR/0Ehjb6gThjvR5YxwmAdgxmdJkpT/tAn1Gv3xc5ZryYxtbbkzSOo82IOIrnfj7 F0kg== X-Gm-Message-State: AOAM531pTmHcsQJEL1Fl4elevXkasGL/k2E8zl9wUElFfEa+1z8gFRax 5oPKADYowJmKusGws2addRo= X-Google-Smtp-Source: ABdhPJwwwggsnYv1U2T4cZvW8EoiY/MiHeaJxKZsWy+W0kOOWgCsxeCKABLYaP3X8w3mWcaSXjsWRg== X-Received: by 2002:a05:600c:4ecb:b0:37c:9125:ac03 with SMTP id g11-20020a05600c4ecb00b0037c9125ac03mr7029865wmq.98.1645188291769; Fri, 18 Feb 2022 04:44:51 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n16sm11841079wrm.19.2022.02.18.04.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:51 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'vhost: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:12 +0000 Message-Id: <20220218123931.1749595-103-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c7bd2f435490e211d98b70ca8ca2dcc4fdf51ece Thanks. Luca Boccassi --- >From c7bd2f435490e211d98b70ca8ca2dcc4fdf51ece Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:38 +0000 Subject: [PATCH] vhost: fix C++ include [ upstream commit 1d1126ad436e8c7c015fb3f67ad3af05c3b397d5 ] The virtio kernel header includes are already noted as being incompatible with C++. We can ensure that the header is safe for inclusion in C++ code by not including those headers during C++ builds. While not ideal, this does ensure that all DPDK headers can be included in C++ code without errors. Fixes: f8904d563691 ("vhost: fix header for strict compilation flags") Signed-off-by: Bruce Richardson --- lib/librte_vhost/rte_vhost.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index 755fb3dd7a..39fe428079 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -21,10 +21,12 @@ extern "C" { #endif +#ifndef __cplusplus /* These are not C++-aware. */ #include #include #include +#endif #define RTE_VHOST_USER_CLIENT (1ULL << 0) #define RTE_VHOST_USER_NO_RECONNECT (1ULL << 1) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.766146065 +0000 +++ 0103-vhost-fix-C-include.patch 2022-02-18 12:37:37.834795136 +0000 @@ -1 +1 @@ -From 1d1126ad436e8c7c015fb3f67ad3af05c3b397d5 Mon Sep 17 00:00:00 2001 +From c7bd2f435490e211d98b70ca8ca2dcc4fdf51ece Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d1126ad436e8c7c015fb3f67ad3af05c3b397d5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/vhost/rte_vhost.h | 2 ++ + lib/librte_vhost/rte_vhost.h | 2 ++ @@ -20,4 +21,4 @@ -diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h -index b454c05868..2acb31df2d 100644 ---- a/lib/vhost/rte_vhost.h -+++ b/lib/vhost/rte_vhost.h +diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h +index 755fb3dd7a..39fe428079 100644 +--- a/lib/librte_vhost/rte_vhost.h ++++ b/lib/librte_vhost/rte_vhost.h