forked from pool/virtualbox
335235e20b
- Version bump to 6.1.24 (released July 20 2021 by Oracle) This is a maintenance release. The following items were fixed and/or added: Storage: Fixed starting a VM if a device is attached to a VirtIO SCSI port higher than 30 (bug #20213) Storage: Improvement to DVD medium change signaling Serial: Fixed a the guest missing interrupts under certain circumstances (6.0 regression, bug #18668) Audio: Multiple fixes and enhancements Network: Fixed connectivity issue with virtio-net after resuming VM with disconnected link Network: Fixed UDP GSO fragmentation issue with missing 8 bytes of payload at the end of the first fragment API: Fixed VM configuration for recent Windows Server versions Extension Pack: Fixed issues with USB webcam pass-through on Linux Host and guest driver: Fix small memory leak (bug #20280) Linux host and guest: Support kernel version 5.13 (bug #20456) Linux host and guest: Introduce support for SUSE SLES/SLED 15 SP3 kernels (bug #20396) Linux host: Installer will not attempt to build kernel modules if system already has them installed and modules versions match current version Guest Additions: Fixed crash on using shared clipboard (bug #19165) Linux Guest Additions: Introduce support for Ubuntu specific kernels (bug #20325) Solaris guest: Increased default memory and disk sizes EFI: Support network booting with the E1000 network controller emulation EFI: Stability improvements (bug #20090) Delete file "fix_random_stack_failure.patch" - fixed upstream. - Add vboximg-mount to packaging. boo#1188045. Fix an error in file "fixes_for_5.14.patch". problem with kernel 5.13 as shown in boo#1188105. OBS-URL: https://build.opensuse.org/request/show/907363 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=611
173 lines
9.1 KiB
Diff
173 lines
9.1 KiB
Diff
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
@@ -330,7 +330,9 @@ static struct drm_driver driver = {
|
|
.master_drop = vbox_master_drop,
|
|
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
|
|
# if RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 4)
|
|
.set_busid = drm_pci_set_busid,
|
|
+#endif
|
|
# endif
|
|
#endif
|
|
|
|
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
|
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
|
|
@@ -618,11 +618,13 @@ int vbox_dumb_destroy(struct drm_file *f
|
|
#endif
|
|
|
|
#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 4)
|
|
static void ttm_bo_put(struct ttm_buffer_object *bo)
|
|
{
|
|
ttm_bo_unref(&bo);
|
|
}
|
|
#endif
|
|
+#endif
|
|
|
|
void vbox_gem_free_object(struct drm_gem_object *obj)
|
|
{
|
|
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
@@ -291,7 +291,7 @@ static struct ttm_backend_func vbox_tt_b
|
|
};
|
|
#endif
|
|
|
|
-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
|
|
unsigned long size,
|
|
u32 page_flags,
|
|
@@ -310,7 +310,7 @@ static struct ttm_tt *vbox_ttm_tt_create
|
|
#if RTLNX_VER_MAX(5,10,0)
|
|
tt->func = &vbox_tt_backend_func;
|
|
#endif
|
|
-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
|
|
#elif RTLNX_VER_MAX(5,11,0)
|
|
if (ttm_tt_init(tt, bo, page_flags)) {
|
|
@@ -325,7 +325,7 @@ static struct ttm_tt *vbox_ttm_tt_create
|
|
}
|
|
|
|
#if RTLNX_VER_MAX(4,17,0)
|
|
-# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
|
|
{
|
|
return ttm_pool_populate(ttm);
|
|
@@ -377,7 +377,7 @@ static struct ttm_bo_driver vbox_bo_driv
|
|
.io_mem_reserve = &vbox_ttm_io_mem_reserve,
|
|
.io_mem_free = &vbox_ttm_io_mem_free,
|
|
#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
|
|
-# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
.io_mem_pfn = ttm_bo_default_io_mem_pfn,
|
|
# endif
|
|
#endif
|
|
@@ -600,7 +600,7 @@ int vbox_bo_create(struct drm_device *de
|
|
|
|
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
|
|
ttm_bo_type_device, &vboxbo->placement,
|
|
-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
align >> PAGE_SHIFT, false, NULL, acc_size,
|
|
#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */
|
|
align >> PAGE_SHIFT, false, acc_size,
|
|
@@ -635,7 +635,7 @@ static inline u64 vbox_bo_gpu_offset(str
|
|
|
|
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
|
|
{
|
|
-#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) || defined(SUSE_SLE12)
|
|
struct ttm_operation_ctx ctx = { false, false };
|
|
#endif
|
|
int ret;
|
|
@@ -658,7 +658,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
|
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
|
#endif
|
|
|
|
-#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|
#else
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|
@@ -680,7 +680,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
|
|
|
int vbox_bo_unpin(struct vbox_bo *bo)
|
|
{
|
|
-#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) || defined(SUSE_SLE12)
|
|
# if RTLNX_VER_MAX(5,11,0)
|
|
struct ttm_operation_ctx ctx = { false, false };
|
|
# endif
|
|
@@ -703,7 +703,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
|
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
|
|
#endif
|
|
|
|
-#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|
#elif RTLNX_VER_MAX(5,11,0)
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|
@@ -726,7 +726,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
|
*/
|
|
int vbox_bo_push_sysram(struct vbox_bo *bo)
|
|
{
|
|
-# if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+# if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) || defined(SUSE_SLE12)
|
|
struct ttm_operation_ctx ctx = { false, false };
|
|
# endif
|
|
int i, ret;
|
|
@@ -747,7 +747,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
|
|
for (i = 0; i < bo->placement.num_placement; i++)
|
|
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
|
|
|
-# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|
# else
|
|
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h
|
|
===================================================================
|
|
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
|
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h
|
|
@@ -87,6 +87,9 @@
|
|
#else
|
|
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
|
|
#endif
|
|
+#if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 4
|
|
+# define SUSE_SLE12
|
|
+#endif
|
|
|
|
/** @def RTLNX_RHEL_RANGE
|
|
* Check that it's a RedHat kernel in the given version range.
|
|
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
@@ -544,7 +544,8 @@ static void vbox_set_edid(struct drm_con
|
|
for (i = 0; i < EDID_SIZE - 1; ++i)
|
|
sum += edid[i];
|
|
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
|
|
-#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || \
|
|
+ defined(SUSE_SLE12) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
drm_connector_update_edid_property(connector, (struct edid *)edid);
|
|
#else
|
|
drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
|
|
@@ -719,7 +720,7 @@ static int vbox_connector_init(struct dr
|
|
drm_connector_register(connector);
|
|
#endif
|
|
|
|
-#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || defined(SUSE_SLE12) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
|
|
drm_connector_attach_encoder(connector, encoder);
|
|
#else
|
|
drm_mode_connector_attach_encoder(connector, encoder);
|