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 6018BA034C for ; Fri, 25 Feb 2022 18:18:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 539254114D; Fri, 25 Feb 2022 18:18:10 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 72834410FD for ; Fri, 25 Feb 2022 18:18:09 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 54E933F1DD for ; Fri, 25 Feb 2022 17:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809489; bh=ECBNp82/hDLNUZBw5+iDWGT3X9cXeR/kJSUdMPv0t4k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XWlRZQSMSuG0wxTOn22sK51fU/F8OxA4A1G25TrR+77xW1Srj58oRHhKfhAs6ndZB Qm8MbNfPHUDRd+WLE4e90EiN8QqEq82RshPwkvM18w80xkVEIiyXFhDc+gCoerduCg jlp9svM5jcmJ0BUns0Mn40W+oHhItm5Yj7D4f23i+1h4qJqIGQ3Ii+M5eFbbFRHIOf B4lja/NDkUYaKouCMEhdmsl6HknxcbYmeXXcEurN78H4Gw+uYi9HZLikGuHB26lZye WjT/I24pNUGq7M4HanM2ymAGW/KMB9qD+Mvn/kS6b+pORNnZvt1dJelF+IF4TH88Zq Y4Db/4pg4EBkA== Received: by mail-wm1-f69.google.com with SMTP id w3-20020a7bc743000000b0037c5168b3c4so1834302wmk.7 for ; Fri, 25 Feb 2022 09:18:09 -0800 (PST) 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=ECBNp82/hDLNUZBw5+iDWGT3X9cXeR/kJSUdMPv0t4k=; b=fueZXkf5JO6zn3+xgpBPLJ/Z5fM7QSPJ4OgmMfdt9GITgCn9Fyy3tF8JTSCoyk2Z+G CzfsCTArhUMlwDvCk2Qt96Ae/eLkHYhGvNkhAG3V6rzAmWXVua5lygcMRzTNFMwTOsso IshvJi9x8iBgjWaqkRKd9uBuec7dYHNOTgcekbx4viaOqCDgqP792YlAZVGKF9KJhw6u fGaTxoS610lvsyPpMOfn594RjG5b91yAKC4MPpwotAuampND0tj1PYTU/GhEEgeeSOkE Y2MEIfpsdwukm6Bx1MueXrtvE4xh+B1ZxvPf+wPb0yYmvno2XCttFnsJciT0i2Y5uLo2 pbXw== X-Gm-Message-State: AOAM530C/OU2g8sbcICo0FNhm0onQMbFruLpfTI46QzHpyfRijC1OrBr 5zc3hxabRYzQ/m1IoycHnFGzvwC9wDkZBpGiwwY1c9gdZ02Q9Nca95p2wQjKFkshSI68DEWZS6l vgRwc4vpSJfu/cBD1CjgmQ06s X-Received: by 2002:a05:600c:348d:b0:380:f6dd:6d95 with SMTP id a13-20020a05600c348d00b00380f6dd6d95mr3610066wmq.141.1645809488965; Fri, 25 Feb 2022 09:18:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxb+1L7pRI3EReTl1wpiuJfv4Gv5CjHRPq2U/1nONNZbX/OTmr0WDgcn4LeUszWIb+8elwYXg== X-Received: by 2002:a05:600c:348d:b0:380:f6dd:6d95 with SMTP id a13-20020a05600c348d00b00380f6dd6d95mr3610044wmq.141.1645809488690; Fri, 25 Feb 2022 09:18:08 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b001ef5b49d68esm3039655wrw.37.2022.02.25.09.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:18:08 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'vhost: fix C++ include' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:40 +0100 Message-Id: <20220225171550.3499040-47-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f0bd885fcbed713f79c4b494d50c7763e502ca33 Thanks. Christian Ehrhardt --- >From f0bd885fcbed713f79c4b494d50c7763e502ca33 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 f85ed4dc50..08bb6a8fe9 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -20,10 +20,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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:46.050547461 +0100 +++ 0047-vhost-fix-C-include.patch 2022-02-25 16:58:44.288990455 +0100 @@ -1 +1 @@ -From 1d1126ad436e8c7c015fb3f67ad3af05c3b397d5 Mon Sep 17 00:00:00 2001 +From f0bd885fcbed713f79c4b494d50c7763e502ca33 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,5 +21,5 @@ -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 -@@ -21,10 +21,12 @@ +diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h +index f85ed4dc50..08bb6a8fe9 100644 +--- a/lib/librte_vhost/rte_vhost.h ++++ b/lib/librte_vhost/rte_vhost.h +@@ -20,10 +20,12 @@