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

Accepting request 784696 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/784696
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=192
This commit is contained in:
Dominique Leuenberger 2020-03-16 09:16:34 +00:00 committed by Git OBS Bridge
commit fcbec863af
6 changed files with 37 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UserManual.pdf
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:fcff201615b3af6f8fef0f7e46f2fef13bef7c4e40ce00979cd8625e086a31aa oid sha256:35d01bc6505a6a58b56013359841bb61135a3f3a17efe05cac9106c32498d347
size 4888852 size 4891142

3
VirtualBox-6.1.2-patched.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfbfc854d0bd405cd7192074f1dac3ef100b73a54cdc6c45e631d5ca404f5702
size 119798818

3
VirtualBox-6.1.4-patched.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:947e0fb682f094b3d5feb5791148d6957355a6abc34dd1081e8573e926636fa6
size 120044114

219
fixes_for_5.5.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile Index: VirtualBox-6.1.4/src/VBox/HostDrivers/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/linux/Makefile --- VirtualBox-6.1.4.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile +++ VirtualBox-6.1.4/src/VBox/HostDrivers/linux/Makefile
@@ -35,9 +35,6 @@ endif @@ -35,9 +35,6 @@ endif
ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
obj-m += vboxnetadp/ obj-m += vboxnetadp/
@ -33,7 +33,7 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile
fi; \ fi; \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \
echo "=== Building 'vboxnetflt' module ==="; \ echo "=== Building 'vboxnetflt' module ==="; \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt || exit 1; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt || exit 1; \
cp vboxnetflt/vboxnetflt.ko .; \ cp vboxnetflt/vboxnetflt.ko .; \
@@ -75,41 +74,29 @@ vboxnetadp: vboxdrv @@ -75,41 +74,29 @@ vboxnetadp: vboxdrv
if [ -f vboxdrv/Module.symvers ]; then \ if [ -f vboxdrv/Module.symvers ]; then \
@ -41,8 +41,8 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile
fi; \ fi; \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \
echo "=== Building 'vboxnetadp' module ==="; \ echo "=== Building 'vboxnetadp' module ==="; \
- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetadp/Module.symvers) -C vboxnetadp || exit 1; \
+ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxnetadp || exit 1; \
cp vboxnetadp/vboxnetadp.ko .; \ cp vboxnetadp/vboxnetadp.ko .; \
echo; \ echo; \
fi fi
@ -53,7 +53,7 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile
- cp vboxdrv/Module.symvers vboxpci; \ - cp vboxdrv/Module.symvers vboxpci; \
- fi; \ - fi; \
- echo "=== Building 'vboxpci' module ==="; \ - echo "=== Building 'vboxpci' module ==="; \
- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci || exit 1; \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci || exit 1; \
- cp vboxpci/vboxpci.ko .; \ - cp vboxpci/vboxpci.ko .; \
- echo; \ - echo; \
- fi - fi
@ -109,10 +109,10 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile
if test -f $$module.ko; then \ if test -f $$module.ko; then \
echo "Installing $$module module"; \ echo "Installing $$module module"; \
/sbin/insmod $$module.ko; \ /sbin/insmod $$module.ko; \
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile Index: VirtualBox-6.1.4/src/VBox/Additions/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/Makefile --- VirtualBox-6.1.4.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile +++ VirtualBox-6.1.4/src/VBox/Additions/linux/Makefile
@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ @@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE else # ! KERNELRELEASE
@ -149,202 +149,3 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi fi
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -35,8 +35,18 @@
#include <linux/module.h>
#include <linux/console.h>
#include <linux/vt_kern.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0))
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
+#include <linux/pci.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_pci.h>
+#else
#include <drm/drmP.h>
+#endif
#include <drm/drm_crtc_helper.h>
#include "vbox_drv.h"
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -103,7 +103,13 @@
#define S64_MIN ((s64)(-S64_MAX - 1))
#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0))
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
+#else
#include <drm/drmP.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
#include <drm/drm_encoder.h>
#endif
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_fb.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c
@@ -42,7 +42,19 @@
#include <linux/fb.h>
#include <linux/init.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0))
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
+#include <linux/pci.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_pci.h>
+#include <drm/drm_ioctl.h>
+#define drm_compat_ioctl NULL
+#else
#include <drm/drmP.h>
+#endif
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_crtc_helper.h>
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -45,6 +45,14 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
#include <drm/drm_probe_helper.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#include <drm/drm_fourcc.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#include <drm/drm_vblank.h>
+#else
+#include <drm/drmP.h>
+#endif
#include "VBoxVideo.h"
@@ -398,6 +406,13 @@ static struct drm_encoder *drm_encoder_f
static struct drm_encoder *vbox_best_single_encoder(struct drm_connector
*connector)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ struct drm_encoder *encoder;
+
+ /* There is only one encoder per connector */
+ drm_connector_for_each_possible_encoder(connector, encoder)
+ return encoder;
+#else
int enc_id = connector->encoder_ids[0];
/* pick the encoder ids */
@@ -410,6 +425,7 @@ static struct drm_encoder *vbox_best_sin
#else
return drm_encoder_find(connector->dev, enc_id);
#endif
+#endif
return NULL;
}
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -34,6 +34,10 @@
*/
#include "vbox_drv.h"
#include <drm/ttm/ttm_page_alloc.h>
+#include <linux/pci.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#include <drm/drm_fourcc.h>
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
#define PLACEMENT_FLAGS(placement) (placement)
@@ -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
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
- DRM_FILE_PAGE_OFFSET, true);
-#else
- true);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+ bdev->vma_manager,
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ DRM_FILE_PAGE_OFFSET,
#endif
+ true);
if (ret) {
DRM_ERROR("Error initialising bo driver; %d\n", ret);
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_irq.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c
@@ -42,6 +42,10 @@
#include <drm/drm_probe_helper.h>
#endif
#include <VBoxVideo.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#include <drm/drm_irq.h>
+#include <linux/pci.h>
+#endif
static void vbox_clear_irq(void)
{

20
virtualbox.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed Mar 11 20:10:36 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.4 (released February 19 2020 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
Virtualization core: Fixed a rare issue with ICEBP instruction causing guru meditations on Intel hosts (6.1.0 regression; bug #19171)
Virtualization core: Fixed macOS Catalina guests failing to boot after upgrading to 10.15.2 onwards (bug #19188)
GUI: recent NLS integration and bug fixes for GUI and Qt translation tags
USB: Fix isochronous transfers to the VM for xHCI
Serial: Fix buffer handling, avoiding receiving stale data when the receive queue is flushed (bug #18671)
Serial: Improve host serial port passthrough handling on Windows host
VBoxManage: Restore old --clipboard option for modifyvm command
Linux guest: Support Linux 5.5 (bug #19145)
Linux guest: Shared folder fix for loopback mounting of images
BIOS: Always report non-ATA disks as ready
BIOS: Report EFI support through DMI table (bug 19144)
VGA BIOS: Reduce stack space usage for INT 10h handlers
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 27 18:38:46 UTC 2020 - Larry Finger <Larry.Finger@gmail.com> Thu Feb 27 18:38:46 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

4
virtualbox.spec
View File

@ -47,7 +47,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
%define _udevrulesdir /usr/lib/udev/rules.d %define _udevrulesdir /usr/lib/udev/rules.d
Name: virtualbox Name: virtualbox
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Version: 6.1.2 Version: 6.1.4
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -147,7 +147,7 @@ Patch130: fixes_for_Leap42.3.patch
Patch132: fixes_for_qt5.13.patch Patch132: fixes_for_qt5.13.patch
# Fixes for openSUSE Leap 15.2 # Fixes for openSUSE Leap 15.2
Patch133: fixes_for_leap15.2.patch Patch133: fixes_for_leap15.2.patch
# Fixes for API changes in kernel 5.5 # Fixes for API changes in kernel 5.6
Patch134: fixes_for_5.5.patch Patch134: fixes_for_5.5.patch
# Fixes for API changes in kernel 5.6 # Fixes for API changes in kernel 5.6
Patch135: fixes_for_5.6.patch Patch135: fixes_for_5.6.patch