patch 'vfio: fix include with musl runtime' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Sun Jun 25 08:33:44 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.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 06/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=47da40029596d48b8c183391c5eefc588677c347

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 47da40029596d48b8c183391c5eefc588677c347 Mon Sep 17 00:00:00 2001
From: Philip Prindeville <philipp at redfish-solutions.com>
Date: Sat, 20 May 2023 12:07:30 -0600
Subject: [PATCH] vfio: fix include with musl runtime
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ]

pread64() and pwrite64() are declared in <unistd.h> in MUSL and
other (i.e. not glibc) C runtimes.

Signed-off-by: Philip Prindeville <philipp at redfish-solutions.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 .mailmap                         | 1 +
 drivers/bus/pci/linux/pci_vfio.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 5dc95a9d07..12939e3bff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1045,6 +1045,7 @@ Peter Spreadborough <peter.spreadborough at broadcom.com>
 Petr Houska <t-pehous at microsoft.com>
 Phanendra Vukkisala <pvukkisala at marvell.com>
 Phil Yang <phil.yang at arm.com>
+Philip Prindeville <philipp at redfish-solutions.com>
 Pierre Pfister <ppfister at cisco.com>
 Piotr Azarewicz <piotr.azarewicz at intel.com> <piotrx.t.azarewicz at intel.com>
 Piotr Bartosiewicz <piotr.bartosiewicz at atendesoftware.pl>
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index fab3483d9f..fe83e1a04e 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
+#include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <linux/pci_regs.h>
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-25 14:31:58.758885100 +0800
+++ 0006-vfio-fix-include-with-musl-runtime.patch	2023-06-25 14:31:58.285773900 +0800
@@ -1 +1 @@
-From c41a103c961ded5a0966652f4daf0a661a947352 Mon Sep 17 00:00:00 2001
+From 47da40029596d48b8c183391c5eefc588677c347 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ]
@@ -9,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -19 +20 @@
-index 0443e461a9..db85cc66c6 100644
+index 5dc95a9d07..12939e3bff 100644
@@ -22 +23 @@
-@@ -1058,6 +1058,7 @@ Peter Spreadborough <peter.spreadborough at broadcom.com>
+@@ -1045,6 +1045,7 @@ Peter Spreadborough <peter.spreadborough at broadcom.com>


More information about the stable mailing list