forked from pool/virtualbox
221b12cb3b
- Version bump to (released April 20 2021 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: Fixed extremely poor VM performance depending on the timing of various actions (regression in 6.1.0) VMM: Fixed guest OS hanging under certain circumstances when Hyper-V is present (bug #20141) VMM: Fixed Guru Meditation error when using a nested hypervisor under certain circumstances (bug #20175) VMM: Fixed a SMAP related host panic affecting Solaris 11.4 systems with Intel Haswell CPUs or later (bug #16068) OCI: Add cloud-init support for export to OCI and for OCI instance creation GUI: Fixed "Delete all files" leaving behind Logs/VBoxUI.log (bug #20235) Audio: Multiple fixes and enhancements Audio: Fixed detection of duplex audio devices on macOS (5.0 regression; bug #20171) Network: Fixed link status reporting for "not attached" adapters Network: Fixed connectivity issues with e1000 in OS/2 guests (6.1.18 regression; bug #20148) Network: Fixed VxWorks e1000 driver compatibility issue (bug #20182) Network: Fixed GUI checks for port forwarding rules rejecting IPv6 with "Nat Network" (bug #14847) DHCP: Don't crash in the presence of fixed address assignments (bug #20128) Serial: Fixed possible VM hang when using the a serial port in disconnected mode (bug #19854) Webcam: Fixed interoperability with v4l2loopback and fixed a crash under certain circumstances (bug #20176) NVMe: Fixed sporadic Windows VM hang or reboot on high CPU load VBoxManage: Allow changing network adapter attachment of a saved VM with "modifyvm" vboximg-mount: Fix for argument processing to honor the '--root' option (6.0 regression; bug #20073) Linux host and guest: Support kernel versions 5.11 (bug #20198) and 5.12 Linux host: Maximum MTU size increased to 16110 for host-only adapters on Linux kernels 4.10+ (bug #19122) Linux Guest Additions: Fix vboxvideo module compilation for kernel version 5.10.x Linux Guest Additions: Fixed kernel module build for RHEL 8.4 beta and CentOS Stream (bug #20289) File "fixes-for-5.11.patch" is deleted. The issue is fixed upstream. File "vboxautostart.sh" is replaced by "vboxautostart-service.sh" File "vboxautostart.service" is replaced by "vboxautostart-service.service" Fixes boo#1183329 "virtualbox 6.1.18 crashes when it runs nested VM" Fixes boo#1183125 "Leap 15.3 installation in Virtualbox without VBox integration" Fixes CVE-2021-2264 and boo#1184542. The directory for the <user>.start files for autostarting VMs is moved from /etc/vbox to /etc/vbox/autostart.d. In addition, the autostart service is hardened (by Oracle). OBS-URL: https://build.opensuse.org/request/show/888128 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=597
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
Index: VirtualBox-6.1.20/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.20.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
+++ VirtualBox-6.1.20/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
@@ -76,6 +76,10 @@
|
|
#define VBOXNETFLT_OS_SPECFIC 1
|
|
#include "../VBoxNetFltInternal.h"
|
|
|
|
+# if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2
|
|
+# define OPENSUSE_152
|
|
+# endif
|
|
+
|
|
typedef struct VBOXNETFLTNOTIFIER {
|
|
struct notifier_block Notifier;
|
|
PVBOXNETFLTINS pThis;
|
|
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
@@ -310,12 +310,15 @@ static void vbox_master_drop(struct drm_
|
|
}
|
|
|
|
static struct drm_driver driver = {
|
|
-#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
|
|
- .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
|
|
+#if RTLNX_VER_MAX(5,4,0)
|
|
+ .driver_features =
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
|
+ DRIVER_PRIME |
|
|
+#endif
|
|
# if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
|
|
DRIVER_IRQ_SHARED |
|
|
# endif
|
|
- DRIVER_PRIME,
|
|
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
|
#else /* >= 5.4.0 && RHEL >= 8.3 */
|
|
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
|
#endif /* < 5.4.0 */
|
|
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
|
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
|
|
@@ -640,8 +640,12 @@ static inline u64 vbox_bo_mmap_offset(st
|
|
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
|
|
return bo->bo.addr_space_offset;
|
|
#else
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
|
+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
|
|
+#else
|
|
return drm_vma_node_offset_addr(&bo->bo.vma_node);
|
|
#endif /* >= 5.4.0 */
|
|
+#endif
|
|
}
|
|
|
|
int
|
|
Index: VirtualBox-6.1.20/include/iprt/cdefs.h
|
|
===================================================================
|
|
--- VirtualBox-6.1.20.orig/include/iprt/cdefs.h
|
|
+++ VirtualBox-6.1.20/include/iprt/cdefs.h
|
|
@@ -1173,14 +1173,15 @@
|
|
* Tell the compiler that we're falling through to the next case in a switch.
|
|
* @sa RT_FALL_THRU */
|
|
#if RT_GNUC_PREREQ(7, 0)
|
|
-# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
|
|
+# define FALL_THROUGH __attribute__((__fallthrough__))
|
|
#else
|
|
-# define RT_FALL_THROUGH() (void)0
|
|
+# define FALL_THROUGH (void)0
|
|
#endif
|
|
/** @def RT_FALL_THRU
|
|
* Tell the compiler that we're falling thru to the next case in a switch.
|
|
* @sa RT_FALL_THROUGH */
|
|
-#define RT_FALL_THRU() RT_FALL_THROUGH()
|
|
+#define RT_FALL_THRU() FALL_THROUGH
|
|
+#define RT_FALL_THROUGH() FALL_THROUGH
|
|
|
|
|
|
/** @def RT_IPRT_FORMAT_ATTR
|