From d24cb8c4701e2f2fe56e7c6e60335696dd33faef3b6f8b25f3b87da3745df5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 10 Sep 2016 15:57:04 +0000 Subject: [PATCH] Accepting request 426206 from home:lwfinger:branches:Virtualization Fix 5.1.4 for build errors with kernel 4.8 OBS-URL: https://build.opensuse.org/request/show/426206 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=274 --- fix_removal_of_DEFINE_PCI_DEVICE_TABLE | 14 ++++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 fix_removal_of_DEFINE_PCI_DEVICE_TABLE diff --git a/fix_removal_of_DEFINE_PCI_DEVICE_TABLE b/fix_removal_of_DEFINE_PCI_DEVICE_TABLE new file mode 100644 index 0000000..e6fe0ec --- /dev/null +++ b/fix_removal_of_DEFINE_PCI_DEVICE_TABLE @@ -0,0 +1,14 @@ +Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -64,8 +64,7 @@ MODULE_PARM_DESC(modeset, "Disable/Enabl + module_param_named(modeset, vbox_modeset, int, 0400); + + static struct drm_driver driver; +- +-static DEFINE_PCI_DEVICE_TABLE(pciidlist) = ++static const struct pci_device_id pciidlist[] = + { + {0x80ee, 0xbeef, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {0, 0, 0}, diff --git a/virtualbox.changes b/virtualbox.changes index aa5774c..0147cf2 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 9 19:24:51 UTC 2016 - Larry.Finger@lwfinger.net + +- Add file "fix_removal_of_DEFINE_PCI_DEVICE_TABLE" to compile on kernel 4.8. + ------------------------------------------------------------------- Fri Sep 2 20:26:22 UTC 2016 - wbauer@tmo.at diff --git a/virtualbox.spec b/virtualbox.spec index 787ef2f..a57dd6c 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -86,6 +86,8 @@ Patch109: vbox-usb-warning.diff Patch111: vbox_prevent_wrong_SONAME.patch # Fix change in kernel API for ttm_bo_move_memcpy() Patch112: modify_for_4_8_bo_move.patch +# Fix source for removal of DEFINE_PCI_DEVICE_TABLE macro +Patch113: fix_removal_of_DEFINE_PCI_DEVICE_TABLE # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -319,6 +321,7 @@ This package contains icons for guest desktop files that were created on the des %patch109 -p1 %patch111 -p1 %patch112 -p1 +%patch113 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf