Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2023-07-11 15:56:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Tue Jul 11 15:56:42 2023 rev:260 rq:1095690 version:7.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2023-06-17
22:19:56.587404496 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.8922/virtualbox.changes
2023-07-11 15:56:49.385003765 +0200
@@ -1,0 +2,6 @@
+Tue Jun 27 19:08:03 UTC 2023 - Larry Finger <larry.fin...@gmail.com>
+
+- Fix builds on kernel 6.4 (boo#1212761)
+ File "fixes_for_kernel_6.4.patch" added.
+
+-------------------------------------------------------------------
New:
----
fixes_for_kernel_6.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.sYoJLw/_old 2023-07-11 15:56:51.537016283 +0200
+++ /var/tmp/diff_new_pack.sYoJLw/_new 2023-07-11 15:56:51.545016330 +0200
@@ -165,6 +165,8 @@
# Support python 3.11
Patch38: python311.patch
Patch39: fix_sdl_build.patch
+# Fix build on kernel 6.4
+Patch40: fixes_for_kernel_6.4.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs}
@@ -486,6 +488,7 @@
%patch37 -p1
%patch38 -p1
%patch39 -p1
+%patch40 -p1
### Documents for virtualbox main package ###
%if %{main_package}
++++++ fixes_for_kernel_6.4.patch ++++++
Index: VirtualBox-7.0.8/src/VBox/Additions/linux/sharedfolders/regops.c
===================================================================
--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-7.0.8/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -179,7 +179,11 @@ static size_t vbsf_iov_iter_count(struct
{
size_t cbRet = 0;
size_t cLeft = iter->nr_segs;
+#if RTLNX_VER_MIN(6, 4, 0)
+ struct iovec const *iov = iter_iov(iter);
+#else
struct iovec const *iov = iter->iov;
+#endif
while (cLeft-- > 0) {
cbRet += iov->iov_len;
iov++;
@@ -295,8 +299,12 @@ void vbsf_iov_iter_revert(struct vbsf_io
}
while (cbRewind > 0) {
- struct iovec const *pIov = --iter->iov;
- size_t const cbSeg = pIov->iov_len;
+#if RTLNX_VER_MIN(6, 4, 0)
+ struct iovec const *pIov = --iter_iov(iter);
+#else
+ struct iovec const *pIov = --iter->iov;
+#endif
+ size_t const cbSeg = pIov->iov_len;
iter->nr_segs++;
Assert((uintptr_t)pIov >= (uintptr_t)iter->iov_org);
@@ -2399,9 +2407,13 @@ static size_t vbsf_iter_max_span_of_page
# if RTLNX_VER_MIN(3,16,0)
if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
# endif
+#if RTLNX_VER_MIN(6, 4, 0)
+ const struct iovec *pCurIov = iter_iov(iter);
+#else
const struct iovec *pCurIov = iter->iov;
- size_t cLeft = iter->nr_segs;
- size_t cPagesSpan = 0;
+#endif
+ size_t cLeft = iter->nr_segs;
+ size_t cPagesSpan = 0;
/* iovect and kvec are identical, except for the __user tagging of
iov_base. */
AssertCompileMembersSameSizeAndOffset(struct iovec, iov_base, struct
kvec, iov_base);
