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

Accepting request 601697 from Virtualization

Browse Source 
- The 3rd time is the charm.

- Fix typo that broke builds for kernel 4.16.

- Update "fixes_for_4.17.patch" for some additional API changes.

- Add "gcc8-configure.patch" to fix boo#1090367.

OBS-URL: https://build.opensuse.org/request/show/601697
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=162
This commit is contained in:
Dominique Leuenberger 2018-04-30 20:48:46 +00:00 committed by Git OBS Bridge
commit c3396f357d
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fixes_for_4.17.patch
View File

@ -10,10 +10,10 @@ This patch released under a combined MIT/GPLv2 license.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Index: VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
Index: VirtualBox-5.2.10/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
===================================================================
--- VirtualBox-5.2.8.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
--- VirtualBox-5.2.10.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ VirtualBox-5.2.10/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -89,7 +89,14 @@ MODULE_VERSION(VBOX_VERSION_STRING " r"
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p)
@ -29,3 +29,47 @@ Index: VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
#else
# define PCI_DEV_GET(v,d,p) pci_find_device(v,d,p)
# define PCI_DEV_PUT(x) do { } while (0)
Index: VirtualBox-5.2.10/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-5.2.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-5.2.10/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -236,10 +236,15 @@ static struct ttm_backend_func vbox_tt_b
.destroy = &vbox_ttm_backend_destroy,
};
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
+static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo,
+ u32 page_flags)
+#else
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
unsigned long size,
u32 page_flags,
struct page *dummy_read_page)
+#endif
{
struct ttm_tt *tt;
@@ -248,7 +253,11 @@ static struct ttm_tt *vbox_ttm_tt_create
return NULL;
tt->func = &vbox_tt_backend_func;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
+ if (ttm_tt_init(tt, bo, page_flags)) {
+#else
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
+#endif
kfree(tt);
return NULL;
}
@@ -450,7 +459,11 @@ int vbox_bo_create(struct drm_device *de
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
ttm_bo_type_device, &vboxbo->placement,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
+ align >> PAGE_SHIFT, false, acc_size,
+#else
align >> PAGE_SHIFT, false, NULL, acc_size,
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
NULL,
#endif

17
virtualbox.changes
View File

@ -1,7 +1,22 @@
-------------------------------------------------------------------
Thu Apr 26 16:27:04 UTC 2018 - Larry.Finger@lwfinger.net
- The 3rd time is the charm.
-------------------------------------------------------------------
Wed Apr 25 20:14:59 UTC 2018 - Larry.Finger@lwfinger.net
- Fix typo that broke builds for kernel 4.16.
-------------------------------------------------------------------
Wed Apr 25 15:23:08 UTC 2018 - Larry.Finger@lwfinger.net
- Update "fixes_for_4.17.patch" for some additional API changes.
-------------------------------------------------------------------
Fri Apr 20 12:05:10 UTC 2018 - mliska@suse.cz
- Add gcc8-configure.patch to fix boo#1090367.
- Add "gcc8-configure.patch" to fix boo#1090367.
-------------------------------------------------------------------
Wed Apr 18 15:56:20 UTC 2018 - Larry.Finger@lwfinger.net