jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 774577 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/774577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=190
This commit is contained in:
Dominique Leuenberger 2020-02-19 11:40:44 +00:00 committed by Git OBS Bridge
commit 1d4c1c45af
5 changed files with 204 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fixes_for_5.5.patch
View File

@ -270,7 +270,53 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
#define PLACEMENT_FLAGS(placement) (placement)
@@ -310,11 +314,12 @@ int vbox_mm_init(struct vbox_private *vb
@@ -102,8 +106,16 @@ static int vbox_ttm_global_init(struct v
*/
static void vbox_ttm_global_release(struct vbox_private *vbox)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ struct ttm_bo_device *bdev = &vbox->ttm.bdev;
+#endif
drm_global_item_unref(&vbox->ttm.bo_global_ref.ref);
drm_global_item_unref(&vbox->ttm.mem_global_ref);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ drm_vma_offset_manager_destroy(bdev->vma_manager);
+ kfree(bdev->vma_offset_manager);
+ bdev->vma_offset_manager = NULL;
+#endif
}
#endif
@@ -296,11 +308,27 @@ int vbox_mm_init(struct vbox_private *vb
int ret;
struct drm_device *dev = vbox->dev;
struct ttm_bo_device *bdev = &vbox->ttm.bdev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ struct drm_vma_offset_manager *vma_manager;
+ vma_manager = kzalloc(sizeof(*vma_manager), GFP_KERNEL);
+ if (!vma_manager)
+ return -ENOMEM;
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
ret = vbox_ttm_global_init(vbox);
- if (ret)
+ if (ret) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ kfree(vma_manager);
+#endif
return ret;
+ }
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ bdev->vma_manager = vma_manager;
+ drm_vma_offset_manager_init(bdev->vma_manager,
+ DRM_FILE_PAGE_OFFSET_START,
+ DRM_FILE_PAGE_OFFSET_SIZE);
#endif
ret = ttm_bo_device_init(&vbox->ttm.bdev,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
@@ -310,11 +338,12 @@ int vbox_mm_init(struct vbox_private *vb
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71)
dev->anon_inode->i_mapping,
#endif

37
fixes_for_5.6.patch Normal file
View File

@ -0,0 +1,37 @@
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -843,9 +843,13 @@ DECLHIDDEN(int) vboxPciOsDevMapRegion(PV
if (!rcLnx)
{
/* For now no caching, try to optimize later. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+ RTR0PTR R0PtrMapping = ioremap(pci_resource_start(pPciDev, iRegion),
+ pci_resource_len(pPciDev, iRegion));
+#else
RTR0PTR R0PtrMapping = ioremap_nocache(pci_resource_start(pPciDev, iRegion),
pci_resource_len(pPciDev, iRegion));
-
+#endif
if (R0PtrMapping != NIL_RTR0PTR)
pIns->aRegionR0Mapping[iRegion] = R0PtrMapping;
else
Index: VirtualBox-6.1.2/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-6.1.2/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -1461,9 +1461,13 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne
* MMIO / physical memory.
*/
Assert(pMemLnxToMap->Core.enmType == RTR0MEMOBJTYPE_PHYS && !pMemLnxToMap->Core.u.Phys.fAllocated);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+ pMemLnx->Core.pv = ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
+#else
pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO
? ioremap_nocache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub)
: ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
+#endif
if (pMemLnx->Core.pv)
{
/** @todo fix protection. */

182
vbox-no-build-dates.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.0_BETA2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
Index: VirtualBox-6.1.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;)
{
Index: VirtualBox-6.1.0_BETA2/src/VBox/Runtime/common/string/uniread.cpp
Index: VirtualBox-6.1.2/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Runtime/common/string/uniread.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.2/src/VBox/Runtime/common/string/uniread.cpp
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Runtime/common/string/uniread.cpp
" */\n"
"\n"
"/*\n"
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -50,10 +50,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@ -73,10 +73,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -99,10 +99,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -125,10 +125,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
Index: VirtualBox-6.1.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
@ -138,10 +138,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTes
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/PC/BIOS/bios.c
Index: VirtualBox-6.1.2/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.0_BETA2/src/VBox/Devices/PC/BIOS/bios.c
--- VirtualBox-6.1.2.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.2/src/VBox/Devices/PC/BIOS/bios.c
@@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
@ -151,10 +151,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/PC/BIOS/bios.c
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -243,7 +243,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n",
@ -164,10 +164,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxService/VBoxService.
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@ -177,10 +177,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@ -190,10 +190,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -342,7 +342,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
@ -203,10 +203,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VNC/Makefile.kmk
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VNC/Makefile.kmk
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VNC/Makefile.kmk
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@ -216,10 +216,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -318,7 +318,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
}
VGDrvCommonInitLoggers();
@ -229,10 +229,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.
/*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n",
@ -242,10 +242,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/linux/lightdm-greeter/vbox-gree
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/solaris/Mouse/vboxms.c
Index: VirtualBox-6.1.2/src/VBox/Additions/solaris/Mouse/vboxms.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/solaris/Mouse/vboxms.c
--- VirtualBox-6.1.2.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.2/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void)
{
@ -255,10 +255,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/solaris/Mouse/vboxms.c
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/*
* Prevent module autounloading.
Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
Index: VirtualBox-6.1.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.0_BETA2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
--- VirtualBox-6.1.2.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -247,10 +247,10 @@ Returns:
UTILITY_NAME,
UTILITY_MAJOR_VERSION,
@ -272,10 +272,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/V
Usage ();
return -1;
}
Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{
@ -294,10 +294,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cp
NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1515,7 +1515,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger");
#endif
@ -307,10 +307,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
Index: VirtualBox-6.1.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.0_BETA2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
--- VirtualBox-6.1.2.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif
"Log opened %s\n",
@ -320,10 +320,10 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
{
PRIntn tab = 0;
@ -333,10 +333,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
main()
{
@ -346,10 +346,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTest
#ifdef TEST_STD_STRING
cout << "Testing std::string." << endl;
#else
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
main()
{
@ -359,10 +359,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTest
#if 0
{
Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
public:
test_message()
@ -372,10 +372,10 @@ Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
}
~test_message()
Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
===================================================================
--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
--- VirtualBox-6.1.2.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
@@ -29,9 +29,8 @@
#include "build_id.h"
@ -387,3 +387,35 @@ Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/bu
#ifndef ElfW
#define ElfW(type) Elf_##type
Index: VirtualBox-6.1.2/src/VBox/Additions/x11/VBoxClient/main.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/x11/VBoxClient/main.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -228,10 +228,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN:
{
pfnLog(pLoggerRelease,
- "VBoxClient %s r%s (verbosity: %u) %s (%s %s) release log\n"
+ "VBoxClient %s r%s (verbosity: %u) %s release log\n"
"Log opened %s\n",
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ szTmp);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.2/src/libs/zlib-1.2.11/os400/make.sh
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-6.1.2/src/libs/zlib-1.2.11/os400/make.sh
@@ -258,8 +258,8 @@ fi
# Create and compile the identification source file.
echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
-echo '#pragma comment(user, __DATE__)' >> os400.c
-echo '#pragma comment(user, __TIME__)' >> os400.c
+#echo '#pragma comment(user, __DATE__)' >> os400.c
+#echo '#pragma comment(user, __TIME__)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.

10
virtualbox.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Feb 15 02:32:06 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Update patches for v5.5 to handle errors in vboxvideo. boo#1163337.
-------------------------------------------------------------------
Wed Feb 12 03:35:20 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Add file "fixes_for_5.6.patch" to handle API changes.
-------------------------------------------------------------------
Fri Jan 17 22:56:58 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

3
virtualbox.spec
View File

@ -149,6 +149,8 @@ Patch132: fixes_for_qt5.13.patch
Patch133: fixes_for_leap15.2.patch
# Fixes for API changes in kernel 5.5
Patch134: fixes_for_5.5.patch
# Fixes for API changes in kernel 5.6
Patch135: fixes_for_5.6.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
BuildRequires: LibVNCServer-devel
@ -451,6 +453,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%endif
%patch133 -p1
%patch134 -p1
%patch135 -p1
# make VB UI background colors look sane again
%patch999 -p1