Accepting request 833533 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/833533 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=204
2020-09-14 10:03:17 +00:00 · 2020-09-14 10:03:17 +00:00 · 59834d0762
commit 59834d0762
parent f9ec77a7f6 3547c62a02
15 changed files with 392 additions and 272 deletions
--- a/UserManual.pdf
+++ b/UserManual.pdf
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d8fd21e1bfbd6f03f534196138370dbf8a3738dd974169af9d5eac9acd1412b
-size 4900225
+oid sha256:d0873ad3f3da8aea7bc25dec24ef7f73d85463ddccda8741167b7e7bfa283c5b
+size 4904831
--- a/VirtualBox-6.1.13-patched.tar.bz2
+++ b/VirtualBox-6.1.13-patched.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0257cc263029a8979a5e03d786bf52ebcec545c2a2c7586d0428bee69cdfdd7
-size 121288285
--- a/VirtualBox-6.1.14-patched.tar.bz2
+++ b/VirtualBox-6.1.14-patched.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00d37841df52222a2153665bd135148bad53453e5892e72c493404fd59174c55
+size 120389752
--- a/fix_lib_search.patch
+++ b/fix_lib_search.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.0.12/configure
+Index: VirtualBox-6.1.14/configure
 ===================================================================
--- VirtualBox-6.0.12.orig/configure
-+++ VirtualBox-6.0.12/configure
-@@ -1546,14 +1546,14 @@ EOF
+--- VirtualBox-6.1.14.orig/configure
+++ VirtualBox-6.1.14/configure
+@@ -1588,14 +1588,14 @@ EOF
         INCQT5="$q/include $q/include/QtCore"
         FLGQT5="-DQT_SHARED"
         I_INCQT5=`prefix_I "$INCQT5"`
--- a/fixes_for_5.9.patch
+++ b/fixes_for_5.9.patch
@ -1,44 +1,54 @@
-Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+This patch file contains the changes needed to compile the VirtualBox
+modules for kernel 5.9.0+.
+
+The changes are as follows:
+1. The kernel headers no longer define HAVE_UNLOCKED_IOCTL; however,
+   this symbol is needed for compilation of VB.
+2. The calling sequence for get_user_pages_remote() is changed.
+3. Routine sched_setscheduler() is replaced by sched_set_fifo_low().
+4. The type of vbox_master_set() is changed from int to void.
+5. Routine drm_gem_object_put_unlocked() is replaced by drm_gem_object_put().
+6. Member offset is removed from struct ttm_buffer_object.
+
+Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -137,7 +137,10 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 #include <linux/compiler.h>
 -#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MIN(5, 9, 0)
 +#define HAVE_UNLOCKED_IOCTL 1	/* defined in linux/fs.h for kernels before 5.9 */
 +#endif
 +#ifndef HAVE_UNLOCKED_IOCTL
 # include <linux/smp_lock.h>
 #endif
 /* For the shared folders module */
-Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -1102,8 +1102,10 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -1181,7 +1181,9 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
          */
         else
             rc = get_user_pages_remote(
-+#if    LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if    RTLNX_VER_MAX(5, 9, 0)
                                 pTask,                  /* Task for fault accounting. */
-                                pTask->mm,              /* Whose pages. */
 +#endif
-+				pTask->mm,              /* Whose pages. */
+                                 pTask->mm,              /* Whose pages. */
                                 R3Ptr,                  /* Where from. */
                                 cPages,                 /* How many pages. */
- # if GET_USER_PAGES_API >= KERNEL_VERSION(4, 9, 0)
-Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
-+++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
@@ -92,8 +92,12 @@ DECLHIDDEN(int) rtThreadNativeSetPriorit
             return VERR_INVALID_PARAMETER;
     }
 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
     sched_setscheduler(current, iSchedClass, &Param);
 #else
 +    sched_set_fifo_low(current);
@ -47,15 +57,15 @@ Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
     RT_NOREF_PV(enmType);
 #endif
     RT_NOREF_PV(pThread);
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -263,8 +263,13 @@ static const struct file_operations vbox
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -262,8 +262,13 @@ static const struct file_operations vbox
 	.read = drm_read,
 };
 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 static int vbox_master_set(struct drm_device *dev,
 			   struct drm_file *file_priv, bool from_open)
 +#else
@ -65,15 +75,15 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.c
 {
 	struct vbox_private *vbox = dev->dev_private;
 
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_fb.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_fb.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_fb.c
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_fb.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_fb.c
@@ -405,7 +405,11 @@ void vbox_fbdev_fini(struct drm_device *
 				vbox_bo_unpin(bo);
 			vbox_bo_unreserve(bo);
 		}
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MIN(5, 9, 0)
 +		drm_gem_object_put(afb->obj);
 +#else
 		drm_gem_object_put_unlocked(afb->obj);
@ -81,10 +91,10 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_fb.c
 		afb->obj = NULL;
 	}
 	drm_fb_helper_fini(&fbdev->helper);
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -40,14 +40,19 @@
 #include <VBoxVideoVBE.h>
 
@ -97,7 +107,7 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
 	struct vbox_framebuffer *vbox_fb = to_vbox_framebuffer(fb);
 
 	if (vbox_fb->obj)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 		drm_gem_object_put_unlocked(vbox_fb->obj);
 -
 +#else
@ -110,7 +120,7 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
 err_free_vbox_fb:
 	kfree(vbox_fb);
 err_unref_obj:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 	drm_gem_object_put_unlocked(obj);
 +#else
 +	drm_gem_object_put(obj);
@ -122,7 +132,7 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
 		return ret;
 
 	ret = drm_gem_handle_create(file, gobj, &handle);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 	drm_gem_object_put_unlocked(gobj);
 +#else
 +	drm_gem_object_put(gobj);
@ -130,29 +140,29 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
 	if (ret)
 		return ret;
 
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -364,6 +364,9 @@ struct vbox_bo {
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -417,6 +417,9 @@ struct vbox_bo {
 #else
 	struct ttm_place placements[3];
 #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MIN(5, 9, 0)
 +	uint64_t offset;
 +#endif
 	int pin_count;
 };
 
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_mode.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_mode.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -887,8 +887,11 @@ out_unmap_bo:
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -885,8 +885,11 @@ out_unmap_bo:
 out_unreserve_bo:
 	vbox_bo_unreserve(bo);
 out_unref_obj:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 	drm_gem_object_put_unlocked(obj);
 -
 +#else
@ -161,15 +171,15 @@ Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_mode.c
 	return ret;
 }
 
-Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_ttm.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_ttm.c
 ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -453,7 +453,11 @@ err_free_vboxbo:
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -445,7 +445,11 @@ err_free_vboxbo:
 
 static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+#if RTLNX_VER_MAX(5, 9, 0)
 	return bo->bo.offset;
 +#else
 +	return bo->offset;
--- a/fixes_for_Qt5.11.patch
+++ b/fixes_for_Qt5.11.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-@@ -85,6 +85,7 @@
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+@@ -83,6 +83,7 @@
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtWidgets/qgraphicslayoutitem.h>
 #include <QtWidgets/qgraphicswidget.h>
@ -10,15 +10,15 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
 #include <QtCore/QMetaType>
 #include <QtGui/qevent.h>
 #include <QtGui/qtouchdevice.h>
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-@@ -21,6 +21,7 @@
- #include <QLabel>
- #include <QRadioButton>
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QButtonGroup>
 #include <QRegExpValidator>
 +#include <QButtonGroup>
 
 /* GUI includes: */
- #include "QILineEdit.h"
+ #include "QIWidgetValidator.h"
--- a/fixes_for_gcc10.patch
+++ b/fixes_for_gcc10.patch
@ -1,29 +1,33 @@
-Index: VirtualBox-6.1.13/Config.kmk
+Index: VirtualBox-6.1.14/Config.kmk
 ===================================================================
--- VirtualBox-6.1.13.orig/Config.kmk
-+++ VirtualBox-6.1.13/Config.kmk
-@@ -2721,8 +2721,16 @@ else
+--- VirtualBox-6.1.14.orig/Config.kmk
+++ VirtualBox-6.1.14/Config.kmk
+@@ -2634,11 +2634,17 @@ else
  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
  # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
 - VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
+-    $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
 + #
 + # Check to make sure that the compiler has either  -dumpfullversion or -dumpversion. gcc-10 has neither
 + RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
 + ifneq ($(RC),0)
-+    # dump version commands not available - hardcode 10.0.1 for the moment
-+    VBOX_GCC_VERSION = 100001
+    # dump version commands not available - hardcode 10.2.1 for the moment
+    VBOX_GCC_VERSION = 100201
 + else
 +    VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
-     $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
+    $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
 + endif
-  ifeq ($(KBUILD_TARGET), darwin)
-   VBOX_CLANG_VERSION = $(shell $(1) --version | \
-     $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
-Index: VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
+ endif
+-
+-# YASM macros
+ ifndef DONT_USE_YASM
+  include $(KBUILD_PATH)/tools/YASM.kmk
+  if1of ($(KBUILD_HOST), win os2)
+Index: VirtualBox-6.1.14/src/VBox/Debugger/DBGCDumpImage.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Debugger/DBGCDumpImage.cpp
-+++ VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
+--- VirtualBox-6.1.14.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-6.1.14/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
 {
     switch (iType)
--- a/fixes_for_leap15.2.patch
+++ b/fixes_for_leap15.2.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+Index: VirtualBox-6.1.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+--- VirtualBox-6.1.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -73,6 +73,10 @@
 #define VBOXNETFLT_OS_SPECFIC 1
 #include "../VBoxNetFltInternal.h"
@ -13,10 +13,10 @@ Index: VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
 typedef struct VBOXNETFLTNOTIFIER {
     struct notifier_block Notifier;
     PVBOXNETFLTINS pThis;
-Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -305,11 +305,13 @@ static void vbox_master_drop(struct drm_
 static struct drm_driver driver = {
 #if RTLNX_VER_MAX(5,4,0)
@ -33,10 +33,10 @@ Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
 #else  /* >= 5.4.0 */
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
 #endif /* <  5.4.0 */
-Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -628,8 +628,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;
@ -50,14 +50,14 @@ Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
 }
 
 int
-Index: VirtualBox-6.1.13/include/iprt/cdefs.h
+Index: VirtualBox-6.1.14/include/iprt/cdefs.h
 ===================================================================
--- VirtualBox-6.1.13.orig/include/iprt/cdefs.h
-+++ VirtualBox-6.1.13/include/iprt/cdefs.h
-@@ -1240,14 +1240,15 @@
- #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
- # define RT_FALL_THROUGH()      [[clang::fallthrough]]
- #elif RT_GNUC_PREREQ(7, 0)
+--- VirtualBox-6.1.14.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.14/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
--- a/fixes_for_makefile.patch
+++ b/fixes_for_makefile.patch
@ -1,20 +1,37 @@
-Index: VirtualBox-6.1.13/src/VBox/HostDrivers/linux/Makefile
+Index: VirtualBox-6.1.14/src/VBox/HostDrivers/linux/Makefile
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/HostDrivers/linux/Makefile
-+++ VirtualBox-6.1.13/src/VBox/HostDrivers/linux/Makefile
-@@ -42,8 +41,9 @@ else # ! KERNELRELEASE
+--- VirtualBox-6.1.14.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-6.1.14/src/VBox/HostDrivers/linux/Makefile
+@@ -35,9 +35,6 @@ endif
+ ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
+  obj-m += vboxnetadp/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
+- obj-m += vboxpci/
+-endif
+ 
+ else # ! KERNELRELEASE
+ 
+@@ -45,12 +42,14 @@ else # ! KERNELRELEASE
 
 KBUILD_VERBOSE ?=
 KERN_VER ?= $(shell uname -r)
-.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp \
-    vboxpci
 +PWD ?= $(shell pwd)
 +
-+.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp
+ .PHONY: all install clean check unload load \
+-    vboxdrv vboxnetflt vboxnetadp vboxpci \
+-    install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci \
+-    clean-vboxdrv clean-vboxnetflt clean-vboxnetadp clean-vboxpci
+    vboxdrv vboxnetflt vboxnetadp \
+    install-vboxdrv install-vboxnetflt install-vboxnetadp \
+    clean-vboxdrv clean-vboxnetflt clean-vboxnetadp
 
- all: vboxdrv vboxnetflt vboxnetadp
+-all: vboxdrv vboxnetflt vboxnetadp vboxpci
+all: vboxdrv vboxnetflt vboxnetadp
 
-@@ -58,22 +58,18 @@ vboxdrv:
+ # We want to build on Linux 2.6.18 and later kernels.
+ ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),)
+@@ -63,63 +62,44 @@ vboxdrv:
 
 vboxnetflt: vboxdrv
 	+@if [ -d vboxnetflt ]; then \
@ -41,22 +58,85 @@ Index: VirtualBox-6.1.13/src/VBox/HostDrivers/linux/Makefile
 	    cp vboxnetadp/vboxnetadp.ko .; \
 	    echo; \
 	fi
-@@ -81,9 +77,11 @@ vboxnetadp: vboxdrv
- install:
+ 
+-vboxpci: vboxdrv
+-	+@if [ -d vboxpci ]; then \
+-	    if [ -f vboxdrv/Module.symvers ]; then \
+-	        cp vboxdrv/Module.symvers vboxpci; \
+-	    fi; \
+-	    echo "=== Building 'vboxpci' module ==="; \
+-	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci || exit 1; \
+-	    cp vboxpci/vboxpci.ko .; \
+-	    echo; \
+-	fi
+-
+ install-vboxdrv:
 	+@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install
+ 
+ install-vboxnetflt:
 	+@if [ -d vboxnetflt ]; then \
 +	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxdrv/Module.symvers; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \
 	fi
+ 
+ install-vboxnetadp:
 	+@if [ -d vboxnetadp ]; then \
 +	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxdrv/Module.symvers; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \
 	fi
 
-Index: VirtualBox-6.1.13/src/VBox/Additions/linux/Makefile
+-install-vboxpci:
+-	+@if [ -d vboxpci ]; then \
+-	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \
+-	fi
+-
+-install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci
+install: install-vboxdrv install-vboxnetflt install-vboxnetadp
+ 
+ else
+ 
+ vboxdrv:
+ vboxnetflt:
+ vboxnetadp:
+-vboxpci:
+ install:
+ 
+ endif
+@@ -140,19 +120,13 @@ clean-vboxnetadp:
+ 	fi
+ 	rm -rf vboxnetadp.ko
+ 
+-clean-vboxpci:
+-	+@if [ -d vboxpci ]; then \
+-	    $(MAKE) -C vboxpci clean; \
+-	fi
+-	rm -f vboxpci.ko
+-
+-clean: clean-vboxdrv clean-vboxnetflt clean-vboxnetadp clean-vboxpci
+clean: clean-vboxdrv clean-vboxnetflt clean-vboxnetadp
+ 
+ check:
+ 	+@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv check
+ 
+ unload:
+-	@for module in vboxpci vboxnetadp vboxnetflt vboxdrv; do \
+	@for module in vboxnetadp vboxnetflt vboxdrv; do \
+ 		if grep "^$$module " /proc/modules >/dev/null; then \
+ 			echo "Removing previously installed $$module module"; \
+ 			/sbin/rmmod $$module; \
+@@ -160,7 +134,7 @@ unload:
+ 	done
+ 
+ load: unload
+-	@for module in vboxdrv vboxnetflt vboxnetadp vboxpci; do \
+	@for module in vboxdrv vboxnetflt vboxnetadp; do \
+ 		if test -f $$module.ko; then \
+ 			echo "Installing $$module module"; \
+ 			/sbin/insmod $$module.ko; \
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/Makefile
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/Makefile
-+++ VirtualBox-6.1.13/src/VBox/Additions/linux/Makefile
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/Makefile
@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
 else # ! KERNELRELEASE
 
@ -69,35 +149,39 @@ Index: VirtualBox-6.1.13/src/VBox/Additions/linux/Makefile
 	    if [ -f vboxguest/Module.symvers ]; then \
 	        cp vboxguest/Module.symvers vboxsf; \
 	    fi; \
-+	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \
+	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \
 	    echo "=== Building 'vboxsf' module ==="; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxsf/Module.symvers) -C vboxsf || exit 1; \
 	    if [ -f vboxsf/vboxsf.ko ]; then \
-@@ -64,6 +66,7 @@ vboxvideo:
- 	    if [ -f vboxguest/Module.symvers ]; then \
- 	        cp vboxguest/Module.symvers vboxvideo; \
- 	    fi; \
-+	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \
+@@ -61,6 +63,9 @@ vboxsf: vboxguest
+ 
+ vboxvideo:
+ 	+ $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
+	    if [ -f vboxguest/Module.symvers ]; then \
+	        cp vboxguest/Module.symvers vboxvideo; \
+	    fi; \
 	    echo "=== Building 'vboxvideo' module ==="; \
- 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxvideo/Module.symvers) -C vboxvideo || exit 1; \
+ 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo || exit 1; \
 	    if [ -f vboxvideo/vboxvideo.ko ]; then \
-@@ -77,9 +80,11 @@ vboxvideo:
- install:
- 	+ $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
+@@ -76,11 +81,13 @@ install-vboxguest:
+ 
+ install-vboxsf:
 	+ $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
 +	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \
 	fi
+ 
+ install-vboxvideo:
 	+ $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
 +	    export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
 	fi
 
-Index: VirtualBox-6.1.13/include/iprt/x86.h
+Index: VirtualBox-6.1.14/include/iprt/x86.h
 ===================================================================
--- VirtualBox-6.1.13.orig/include/iprt/x86.h
-+++ VirtualBox-6.1.13/include/iprt/x86.h
-@@ -858,37 +858,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+--- VirtualBox-6.1.14.orig/include/iprt/x86.h
+++ VirtualBox-6.1.14/include/iprt/x86.h
+@@ -840,37 +840,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
  *          reserved flags.
  * @{ */
 /** Bit 0 - PE - Protection Enabled */
@ -157,7 +241,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 #define X86_CR0_PAGING                      RT_BIT_32(31)
 #define X86_CR0_BIT_PG                      31 /**< Bit number of X86_CR0_PG */
 /** @} */
-@@ -897,9 +919,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -879,9 +901,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
 /** @name CR3
  * @{ */
 /** Bit 3 - PWT - Page-level Writes Transparent. */
@ -171,7 +255,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** Bits 12-31 - - Page directory page number. */
 #define X86_CR3_PAGE_MASK                   (0xfffff000)
 /** Bits  5-31 - - PAE Page directory page number. */
-@@ -912,46 +938,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -894,46 +920,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
 /** @name CR4
  * @{ */
 /** Bit 0 - VME - Virtual-8086 Mode Extensions. */
@ -256,7 +340,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
 #define X86_CR4_CET                         RT_BIT_32(23)
 /** @} */
-@@ -1165,12 +1229,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1147,12 +1211,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** Machine check type register (P5). */
 #define MSR_P5_MC_TYPE                      UINT32_C(0x00000001)
 /** Time Stamp Counter. */
@ -273,7 +357,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 #ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
 # define MSR_IA32_APICBASE                  0x1b
-@@ -1196,7 +1264,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1178,7 +1246,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_CORE_THREAD_COUNT               0x35
 
 /** CPU Feature control. */
@ -283,7 +367,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** Feature control - Lock MSR from writes (R/W0). */
 #define MSR_IA32_FEATURE_CONTROL_LOCK                 RT_BIT_64(0)
 /** Feature control - Enable VMX inside SMX operation (R/WL). */
-@@ -1221,11 +1291,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1203,11 +1273,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_FEATURE_CONTROL_LMCE                 RT_BIT_64(20)
 
 /** Per-processor TSC adjust MSR. */
@ -299,7 +383,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** IBRS - Indirect branch restricted speculation. */
 #define MSR_IA32_SPEC_CTRL_F_IBRS           RT_BIT_32(0)
 /** STIBP - Single thread indirect branch predictors. */
-@@ -1235,7 +1309,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1215,7 +1289,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 
 /** Prediction command register.
  * Write only, logical processor scope, no state since write only. */
@ -309,7 +393,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** IBPB - Indirect branch prediction barrie when written as 1. */
 #define MSR_IA32_PRED_CMD_F_IBPB            RT_BIT_32(0)
 
-@@ -1246,7 +1322,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1226,7 +1302,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_BIOS_SIGN_ID               0x8B
 
 /** SMM monitor control. */
@ -319,7 +403,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** SMM control - Valid. */
 #define MSR_IA32_SMM_MONITOR_VALID                  RT_BIT_64(0)
 /** SMM control - VMXOFF unblocks SMI. */
-@@ -1255,10 +1333,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1235,10 +1313,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a)      (((a) >> 12) & UINT64_C(0xfffff))
 
 /** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */
@ -334,7 +418,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** General performance counter no. 1. */
 #define MSR_IA32_PMC1                       0xC2
 /** General performance counter no. 2. */
-@@ -1281,18 +1363,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1261,18 +1343,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_FSB_CLOCK_STS              0xCD
 
 /** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */
@ -361,7 +445,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** CPU is no subject to meltdown problems. */
 #define MSR_IA32_ARCH_CAP_F_RDCL_NO         RT_BIT_32(0)
 /** CPU has better IBRS and you can leave it on all the time. */
-@@ -1306,7 +1396,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1286,7 +1376,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_ARCH_CAP_F_MDS_NO          RT_BIT_32(4)
 
 /** Flush command register. */
@ -371,7 +455,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** Flush the level 1 data cache when this bit is written. */
 #define MSR_IA32_FLUSH_CMD_F_L1D            RT_BIT_32(0)
 
-@@ -1327,14 +1419,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1307,14 +1399,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #endif
 
 /** Machine Check Global Capabilities Register. */
@ -392,7 +476,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 /** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4
  *  "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */
 #define MSR_IA32_CR_PAT_INIT_VAL            UINT64_C(0x0007040600070406)
-@@ -1353,36 +1451,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1333,36 +1431,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_FLEX_RATIO                      0x194
 /** Performance state value and starting with Intel core more.
  * Apple uses the >=core features to determine TSC granularity on older CPUs. */
@ -451,7 +535,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 /** Trace/Profile Resource Control (R/W) */
 #define MSR_IA32_DEBUGCTL                   UINT32_C(0x000001d9)
-@@ -1520,7 +1640,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1500,7 +1620,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** @} */
 
 /** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@ -461,7 +545,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 /** Variable range MTRRs.
  * @{ */
-@@ -1570,89 +1692,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1550,89 +1672,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_PERF_GLOBAL_OVF_CTRL       0x390
 
 /** Precise Event Based sampling (Intel only). */
@ -629,7 +713,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 /** X2APIC MSR range start. */
 #define MSR_IA32_X2APIC_START               0x800
-@@ -1787,23 +1987,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1767,23 +1967,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** The mask which give the SYSCALL EIP. */
 #define  MSR_K6_STAR_SYSCALL_EIP_MASK       UINT32_C(0xffffffff)
 /** K6 WHCR - Write Handling Control Register. */
@ -677,7 +761,7 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 /** K8 LSTAR - Long mode SYSCALL target (RIP). */
 #define MSR_K8_LSTAR                        UINT32_C(0xc0000082)
-@@ -1819,14 +2043,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1799,14 +2023,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_K8_KERNEL_GS_BASE               UINT32_C(0xc0000102)
 /** K8 TSC_AUX - Used with RDTSCP. */
 #define MSR_K8_TSC_AUX                      UINT32_C(0xc0000103)
@ -698,10 +782,10 @@ Index: VirtualBox-6.1.13/include/iprt/x86.h
 
 /** SMM MSRs. */
 #define MSR_K7_SMBASE                       UINT32_C(0xc0010111)
-Index: VirtualBox-6.1.13/include/VBox/vmm/hm_vmx.h
+Index: VirtualBox-6.1.14/include/VBox/vmm/hm_vmx.h
 ===================================================================
--- VirtualBox-6.1.13.orig/include/VBox/vmm/hm_vmx.h
-+++ VirtualBox-6.1.13/include/VBox/vmm/hm_vmx.h
+--- VirtualBox-6.1.14.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-6.1.14/include/VBox/vmm/hm_vmx.h
@@ -1473,7 +1473,9 @@ AssertCompileSize(VMXABORT, 4);
 /** VMCS (and related regions) memory type - Uncacheable. */
 #define VMX_BASIC_MEM_TYPE_UC                                   0
@ -712,10 +796,10 @@ Index: VirtualBox-6.1.13/include/VBox/vmm/hm_vmx.h
 /** Width of physical addresses used for VMCS and associated memory regions
  *  (1=32-bit, 0=processor's physical address width). */
 #define VMX_BASIC_PHYSADDR_WIDTH_32BIT                          RT_BIT_64(48)
-Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,12 @@
 #else
 # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
--- a/fixes_for_python.patch
+++ b/fixes_for_python.patch
@ -6,13 +6,13 @@ to "#!/usr/bin/python3".

 Larry Finger

-Index: VirtualBox-6.1.13/src/VBox/Frontends/VBoxShell/vboxshell.py
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VBoxShell/vboxshell.py
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VBoxShell/vboxshell.py
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
+++ VirtualBox-6.1.14/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
 # -*- coding: utf-8 -*-
- # $Id: vboxshell.py 82968 2020-02-04 10:35:17Z vboxsync $
+ # $Id: vboxshell.py $
 
--- a/remove_vbox_video_build.patch
+++ b/remove_vbox_video_build.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.0_BETA1/Makefile.kmk
+Index: VirtualBox-6.1.14/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.0_BETA1.orig/Makefile.kmk
-+++ VirtualBox-6.1.0_BETA1/Makefile.kmk
-@@ -705,7 +705,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
+--- VirtualBox-6.1.14.orig/Makefile.kmk
+++ VirtualBox-6.1.14/Makefile.kmk
+@@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
 	src/VBox/Additions/x11/vboxmouse \
 	src/VBox/Additions/x11/vboxmouse/xorg70 \
 	src/VBox/Additions/x11/vboxmouse/xorg71 \
@ -10,10 +10,10 @@ Index: VirtualBox-6.1.0_BETA1/Makefile.kmk
 	src/VBox/NetworkServices \
 	src/VBox/NetworkServices/Dhcpd \
 	src/VBox/NetworkServices/NAT \
-Index: VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-6.1.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-6.1.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
 vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
 vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
  DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-Index: VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/Makefile.kmk
+Index: VirtualBox-6.1.14/src/VBox/Additions/x11/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Additions/x11/Makefile.kmk
-+++ VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-6.1.14.orig/src/VBox/Additions/x11/Makefile.kmk
+++ VirtualBox-6.1.14/src/VBox/Additions/x11/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
--- a/switch_to_python3.4+.patch
+++ b/switch_to_python3.4+.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.13/src/bldprogs/scm.cpp
+Index: VirtualBox-6.1.14/src/bldprogs/scm.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/bldprogs/scm.cpp
-+++ VirtualBox-6.1.13/src/bldprogs/scm.cpp
+--- VirtualBox-6.1.14.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.1.14/src/bldprogs/scm.cpp
@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
                             pszTreatAs = "shell";
                         else if (   (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.13/src/bldprogs/scm.cpp
                         else if (   (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
                                  || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
                             pszTreatAs = "perl";
-Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/configure
+Index: VirtualBox-6.1.14/src/libs/libxml2-2.9.4/configure
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/configure
-+++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/configure
+--- VirtualBox-6.1.14.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.1.14/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
 PYTHON_TESTS=
 pythondir=
@ -39,11 +39,11 @@ Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/configure
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PYTHON+:} false; then :
-Index: VirtualBox-6.1.13/src/VBox/ValidationKit/testboxscript/setup.sh
+Index: VirtualBox-6.1.14/src/VBox/ValidationKit/testboxscript/setup.sh
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/ValidationKit/testboxscript/setup.sh
-+++ VirtualBox-6.1.13/src/VBox/ValidationKit/testboxscript/setup.sh
-@@ -659,7 +659,7 @@ import sys;\
+--- VirtualBox-6.1.14.orig/src/VBox/ValidationKit/testboxscript/setup.sh
+++ VirtualBox-6.1.14/src/VBox/ValidationKit/testboxscript/setup.sh
+@@ -652,7 +652,7 @@ import sys;\
 x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or (sys.version_info[1] == 5 and sys.version_info[2] >= 1));\
 sys.exit(not x);\
 ";
@ -52,12 +52,12 @@ Index: VirtualBox-6.1.13/src/VBox/ValidationKit/testboxscript/setup.sh
     do
         python=`which ${python} 2> /dev/null`
         if [ -n "${python}" -a -x "${python}" ]; then
-Index: VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+Index: VirtualBox-6.1.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-+++ VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-@@ -21,7 +21,7 @@
- %define %CHM% 1
+--- VirtualBox-6.1.14.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.1.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+@@ -20,7 +20,7 @@
+ %define %PYTHON% 1
 %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
 %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$
 -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@ -65,7 +65,7 @@ Index: VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 
 Summary:   Oracle VM VirtualBox
 Name:      %NAME%
-@@ -101,7 +101,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
+@@ -100,7 +100,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
 %if %{?with_python:1}%{!?with_python:0}
 (export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
   cd ./sdk/installer && \
@ -74,10 +74,10 @@ Index: VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 %endif
 rm -rf sdk/installer
 mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
-Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml.spec.in
+Index: VirtualBox-6.1.14/src/libs/libxml2-2.9.4/libxml.spec.in
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/libxml.spec.in
-+++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml.spec.in
+--- VirtualBox-6.1.14.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-6.1.14/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
 
 make install DESTDIR=%{buildroot}
@ -93,10 +93,10 @@ Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml.spec.in
 
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml2.spec
+Index: VirtualBox-6.1.14/src/libs/libxml2-2.9.4/libxml2.spec
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/libxml2.spec
-+++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml2.spec
+--- VirtualBox-6.1.14.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.1.14/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
 
 %if 0%{?with_python3}
@ -106,10 +106,10 @@ Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml2.spec
 make install DESTDIR=%{buildroot}
 %endif # with_python3
 
-Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+Index: VirtualBox-6.1.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+--- VirtualBox-6.1.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.1.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
 	{ // a temp scope so I can use temp locals.
 #if PY_MAJOR_VERSION <= 2
@ -119,10 +119,10 @@ Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 #else
     /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
 	const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
-Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/PyGBase.cpp
+Index: VirtualBox-6.1.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-6.1.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.1.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
 // Get the correct interface pointer for this object given the IID.
 void *PyG_Base::ThisAsIID( const nsIID &iid )
@ -136,11 +136,11 @@ Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/PyGBase.cpp
 	if (iid.Equals(NS_GET_IID(nsISupports)))
 		return (nsISupports *)(nsIInternalPython *)this;
 	if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
-Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/Makefile.kmk
+Index: VirtualBox-6.1.14/src/libs/xpcom18a4/python/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/Makefile.kmk
-+++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -554,6 +554,52 @@ VBoxPython3_8m_x86_LIBS       = $(VBOX_P
+--- VirtualBox-6.1.14.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.14/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -533,6 +533,52 @@ VBoxPython3_8m_x86_LIBS       = $(VBOX_P
  endif
 endif
 
@ -193,10 +193,10 @@ Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/Makefile.kmk
 ifdef VBOX_PYTHONDEF_INC
 #
 # Python without versioning
-Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/gen_python_deps.py
+Index: VirtualBox-6.1.14/src/libs/xpcom18a4/python/gen_python_deps.py
 ===================================================================
--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/gen_python_deps.py
-+++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/gen_python_deps.py
+--- VirtualBox-6.1.14.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-6.1.14/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -16,7 +16,7 @@ from __future__ import print_function
 import os,sys
 from distutils.version import StrictVersion
--- a/virtualbox-fix-ui-background-color.patch
+++ b/virtualbox-fix-ui-background-color.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
@@ -124,10 +124,6 @@ void UITools::preparePalette()
 {
     /* Setup palette: */
@ -13,11 +13,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
 }
 
 void UITools::prepareLayout()
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
-@@ -2033,7 +2033,7 @@ void UIVirtualBoxManager::prepareMenuBar
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+@@ -1323,7 +1323,7 @@ void UIVirtualBoxManager::prepareMenuBar
         /* Make sure menu-bar fills own solid background: */
         menuBar()->setAutoFillBackground(true);
         QPalette pal = menuBar()->palette();
@ -26,13 +26,13 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxM
         pal.setColor(QPalette::Active, QPalette::Button, color);
         menuBar()->setPalette(pal);
     }
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
-@@ -193,10 +193,6 @@ void UIChooser::prepare()
- void UIChooser::preparePalette()
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+@@ -121,10 +121,6 @@ void UIChooser::preparePalette()
 {
+     /* Setup palette: */
     setAutoFillBackground(true);
 -    QPalette pal = palette();
 -    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
@ -40,12 +40,12 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
 -    setPalette(pal);
 }
 
- void UIChooser::prepareModel()
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+ void UIChooser::prepareLayout()
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
-@@ -960,7 +960,7 @@ void UIChooserItemMachine::paintBackgrou
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+@@ -909,7 +909,7 @@ void UIChooserItemMachine::paintBackgrou
     else
     {
         /* Prepare color: */
@ -54,7 +54,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
         bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
-@@ -989,7 +989,7 @@ void UIChooserItemMachine::paintBackgrou
+@@ -938,7 +938,7 @@ void UIChooserItemMachine::paintBackgrou
             /* Default background: */
             else
             {
@ -63,7 +63,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
                 color1 = backgroundColor.lighter(m_iDefaultLightnessMax);
                 color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70);
             }
-@@ -1010,7 +1010,7 @@ void UIChooserItemMachine::paintBackgrou
+@@ -959,7 +959,7 @@ void UIChooserItemMachine::paintBackgrou
             /* Default background: */
             else
             {
@ -72,7 +72,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
                 color1 = backgroundColor.lighter(m_iDefaultLightnessMin);
                 color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40);
             }
-@@ -1045,7 +1045,7 @@ void UIChooserItemMachine::paintFrame(QP
+@@ -994,7 +994,7 @@ void UIChooserItemMachine::paintFrame(QP
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
     /* Default frame: */
     else
@ -81,10 +81,10 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
 
     /* Create/assign pen: */
     QPen pen(strokeColor);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
@@ -716,7 +716,7 @@ void UIToolsItem::paintBackground(QPaint
         /* Prepare color: */
         const QColor backgroundColor = isEnabled()
@ -123,13 +123,13 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
 
     /* Create/assign pen: */
     QPen pen(strokeColor);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
-@@ -493,14 +493,6 @@ void UIVirtualBoxManagerWidget::prepare(
- void UIVirtualBoxManagerWidget::preparePalette()
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+@@ -352,14 +352,6 @@ void UIVirtualBoxManagerWidget::prepare(
 {
+     /* Configure palette: */
     setAutoFillBackground(true);
 -    QPalette pal = palette();
 -#ifdef VBOX_WS_MAC
@ -139,10 +139,10 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxM
 -#endif
 -    pal.setColor(QPalette::Window, color);
 -    setPalette(pal);
- }
 
- void UIVirtualBoxManagerWidget::prepareWidgets()
-@@ -621,7 +613,7 @@ void UIVirtualBoxManagerWidget::prepareW
+     /* Prepare: */
+     prepareWidgets();
+@@ -490,7 +482,7 @@ void UIVirtualBoxManagerWidget::prepareW
             }
 
             /* Adjust splitter colors according to main widgets it splits: */
@ -151,11 +151,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxM
             /* Set the initial distribution. The right site is bigger. */
             m_pSplitter->setStretchFactor(0, 2);
             m_pSplitter->setStretchFactor(1, 3);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
-@@ -647,7 +647,7 @@ void UIChooserItem::paintFlatButton(QPai
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+@@ -646,7 +646,7 @@ void UIChooserItem::paintFlatButton(QPai
 
     /* Prepare colors: */
     const QPalette pal = QApplication::palette();
@ -164,25 +164,25 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
 
     /* Prepare pen: */
     QPen pen;
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
-@@ -246,10 +246,6 @@ void UIChooserView::prepare()
- void UIChooserView::prepareThis()
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+@@ -245,10 +245,6 @@ void UIChooserView::prepare()
+ void UIChooserView::preparePalette()
 {
-     /* Prepare palette: */
+     /* Setup palette: */
 -    QPalette pal = qApp->palette();
 -    const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
 -    pal.setColor(QPalette::Base, bodyColor);
 -    setPalette(pal);
+ }
 
-     /* Prepare frame: */
-     setFrameShape(QFrame::NoFrame);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+ void UIChooserView::resizeEvent(QResizeEvent *pEvent)
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
@@ -182,10 +182,6 @@ void UIToolsView::prepare()
 void UIToolsView::preparePalette()
 {
@ -194,11 +194,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
 }
 
 void UIToolsView::resizeEvent(QResizeEvent *pEvent)
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
-@@ -1302,7 +1302,7 @@ void UIDetailsElement::paintBackground(Q
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+@@ -1185,7 +1185,7 @@ void UIDetailsElement::paintBackground(Q
     const QPalette pal = palette();
 
     /* Paint default background: */
@ -207,7 +207,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
     const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal);
     const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart);
     QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft());
-@@ -1343,7 +1343,7 @@ void UIDetailsElement::paintFrame(QPaint
+@@ -1226,7 +1226,7 @@ void UIDetailsElement::paintFrame(QPaint
                           : optionRect;
 
     /* Paint frame: */
@ -216,10 +216,10 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
     QPen pen(strokeColor);
     pen.setWidth(0);
     pPainter->setPen(pen);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
@@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent *
         const QRect rectangle = pEvent->rect();
 
@ -229,11 +229,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
         QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
         gradient.setColorAt(0,   backgroundColor.lighter(130));
         gradient.setColorAt(1,   backgroundColor.lighter(125));
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
-@@ -764,7 +764,7 @@ void UIDetailsSet::paintBackground(QPain
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+@@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain
     const QRect optionRect = pOptions->rect;
 
     /* Paint default background: */
@ -242,11 +242,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
     pPainter->fillRect(optionRect, defaultColor);
 
     /* Restore painter: */
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
-@@ -644,7 +644,7 @@ void UIChooserItemGlobal::paintBackgroun
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+@@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun
         pPainter->fillRect(rectangle, bgGrad);
 #else
         /* Prepare color: */
@ -255,7 +255,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
         /* Draw gradient: */
         pPainter->fillRect(rectangle, backgroundColor);
 #endif
-@@ -675,7 +675,7 @@ void UIChooserItemGlobal::paintFrame(QPa
+@@ -670,7 +670,7 @@ void UIChooserItemGlobal::paintFrame(QPa
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
     /* Default frame: */
     else
@ -264,11 +264,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
 
     /* Create/assign pen: */
     QPen pen(strokeColor);
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
-@@ -286,7 +286,7 @@ void UIDetailsGroup::paintBackground(QPa
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+@@ -283,7 +283,7 @@ void UIDetailsGroup::paintBackground(QPa
 #ifdef VBOX_WS_MAC
     const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145);
 #else
@ -277,11 +277,11 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
 #endif
     pPainter->fillRect(optionRect, defaultColor);
 
-Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
 ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
-+++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
-@@ -1579,7 +1579,7 @@ void UIChooserItemGroup::paintBackground
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+@@ -1500,7 +1500,7 @@ void UIChooserItemGroup::paintBackground
     const QPalette pal = palette();
     const QColor headerColor = pal.color(QPalette::Active,
                                          model()->selectedItems().contains(this) ?
@ -290,7 +290,7 @@ Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
 
     /* Root-item: */
     if (isRoot())
-@@ -1676,7 +1676,7 @@ void UIChooserItemGroup::paintFrame(QPai
+@@ -1597,7 +1597,7 @@ void UIChooserItemGroup::paintFrame(QPai
     const QPalette pal = palette();
     const QColor strokeColor = pal.color(QPalette::Active,
                                          model()->selectedItems().contains(this) ?
--- a/virtualbox.changes
+++ b/virtualbox.changes
@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Sep 10 16:12:11 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
+
+- Update to Oracle version 6.1.14a. This minor update enables the building of libvirt again.
+  File "fix_virtio_build.patch" is removed.
+
+-------------------------------------------------------------------
+Tue Sep  8 02:20:35 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
+
+- Remove symbols that forced rebuild of initrd
+
+- Version update to 6.1.14 (released September 04 2020 by Oracle)
+  File "fix_virtio_build.patch" is added to fix a build problem.
+
+  This is a maintenance release. The following items were fixed and/or added:
+
+  GUI: Fixes file name changes in the File location field when creating Virtual Hard Disk (bug #19286)
+  VMM: Fixed running VMs which failed to start with VERR_NEM_MISSING_KERNEL_API_2 when Hyper-V is used (bug #19779 and #19804)
+  Audio: fix regression in HDA emulation introduced in 6.1.0
+  Shared Clipboard: Fixed a potential crash when copying HTML data (6.1.2 regression; bug #19226)
+  Linux host and guest: Linux kernel version 5.8 support
+  EFI: Fixed reading ISO9660 filesystems on attached media (6.1.0 regression; bug #19682)
+  EFI: Support booting from drives attached to the LsiLogic SCSI and SAS controller emulations
+
 -------------------------------------------------------------------
 Fri Aug 28 20:56:29 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

--- a/virtualbox.spec
+++ b/virtualbox.spec
@ -66,7 +66,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile

 # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
 Name:           virtualbox%{?dash}%{?name_suffix}
-Version:        6.1.13
+Version:        6.1.14
 Release:        0
 Summary:        %{package_summary}
 License:        GPL-2.0-or-later
@ -680,6 +680,7 @@ install -m 755 VBoxEFI*.fd			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxSysInfo.sh			%{buildroot}%{_vbox_instdir}
 install -m 644 *.so		 		%{buildroot}%{_vbox_instdir}
 install -m 644 *.r0 				%{buildroot}%{_vbox_instdir}
+rm components/VBoxREM.so
 install -m 644 components/*			%{buildroot}%{_vbox_instdir}/components/
 # install languages
 install -m 644 nls/*				%{buildroot}%{_datadir}/virtualbox/nls/
@ -709,9 +710,9 @@ install -m 644 %{SOURCE4}			%{buildroot}%{_sysconfdir}/default/virtualbox
 install -m 644 %{SOURCE9}			%{buildroot}%{_bindir}/VirtualBox
 install -m 644 %{SOURCE8}			%{buildroot}%{_bindir}/update-extpack.sh
 # Service files to load kernel modules on boot
-install -m 0644 %{SOURCE14}			%{buildroot}%{_unitdir}/vboxdrv.service
+install -m 0644 %{SOURCE14}                     %{buildroot}%{_unitdir}/vboxdrv.service
 ln -s -f %{_sbindir}/service			%{buildroot}%{_sbindir}/rcvboxdrv
-install -m 0644 %{SOURCE15}			%{buildroot}%{_unitdir}/vboxadd-service.service
+install -m 0644 %{SOURCE15}                     %{buildroot}%{_unitdir}/vboxadd-service.service
 install -m 0755 %{SOURCE16}			%{buildroot}/sbin/vboxconfig
 install -m 0755 %{SOURCE17}			%{buildroot}/sbin/vboxguestconfig
 install -m 0755 %{SOURCE18}			%{buildroot}/sbin/vbox-fix-usb-rules.sh
@ -1212,9 +1213,6 @@ done
 %install
 export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=extra
-#Keep the install process from calling mkinitrd. The VB kernel modules are not in initrd. bsc#1052428
-export INITRD_IN_POSTTRANS=1
-export KMP_NEEDS_MKINITRD=0
 #to install modules we use here similar steps like in build phase, go through all the modules :
 for module_name in vbox{drv,netflt,netadp,guest,sf,video}
 do