vboxguestdrivers: fix compilation against 6.4 kernel / headers
PATCH 1/1 vboxguestdrivers: fix compilation against 6.4 kernel / headers
From: Bruce Ashfield <[email protected]>
The vboxguest drivers (vboxsf) fail to build against the 6.4 kernel due to iovec iterator changes.
This is a port of the gentoo patches (which are picked from the upstream virtualbox repository) to address the compilation issues.
We obviously can drop these when the next version of the guest additions is available.
---
Khem,
At the moment, I'm unable to reach the virtualbox main site due to a bad gateway, so I've instead grabbed the gentoo fix, and tracked it to the upstream changset.
I'm preparing the 6.4 libc-headers and kernel and ran into this compiliation issue, and wanted to get the change in place before I send the main series.
Bruce
...t-additions-7.0.8-kernel-6.4-patch-1.patch | 29 +++++++++++++ ...t-additions-7.0.8-kernel-6.4-patch-2.patch | 43 +++++++++++++++++++ .../vboxguestdrivers_7.0.8.bb | 2 + 3 files changed, 74 insertions(+) create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch new file +29 -0
@@ -0,0 +1,29 @@ +Initial support for kernel 6.4 +https://www.virtualbox.org/changeset/99666/vbox + +Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch] + +Signed-off-by: Bruce Ashfield <[email protected]> + +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -75,4 +75,11 @@ + #if RTLNX_VER_MAX(2,5,12) + # define PageUptodate(a_pPage) Page_Uptodate(a_pPage) ++#endif ++ ++/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ ++#if RTLNX_VER_MIN(6,4,0) ++# define VBOX_ITER_IOV(_iter) iter_iov(_iter) ++#else ++# define VBOX_ITER_IOV(_iter) iter->iov + #endif + +@@ -2400,5 +2407,5 @@ + if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { + # endif +- const struct iovec *pCurIov = iter->iov; ++ const struct iovec *pCurIov = VBOX_ITER_IOV(iter); + size_t cLeft = iter->nr_segs; + size_t cPagesSpan = 0; +
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch new file +43 -0
43 lines not on this page · raw message
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb +2 -0
@@ -13,6 +13,8 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch \ + file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch \ " SRC_URI[sha256sum] = "c305fbe480f507eac7c36893ead66dffaacda944f19c3813a4533e9c39bae237"
Signature · 1 line
2.39.2