diff options
| author | Unknown <iulian.meghea@gmail.com> | 2018-05-05 11:22:23 +0300 |
|---|---|---|
| committer | Unknown <iulian.meghea@gmail.com> | 2018-05-05 11:22:32 +0300 |
| commit | d25607c79db9fca7f1c8696b792e376b42fb2ecb (patch) | |
| tree | b017e15a9d695062fe5c9c652921e7f89943260d /pkgs/applications/virtualization/virtualbox | |
| parent | b41ede5e3a398683d5722b7c0503e019a365d222 (diff) | |
| download | nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar.gz nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar.bz2 nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar.lz nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar.xz nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.tar.zst nixlib-d25607c79db9fca7f1c8696b792e376b42fb2ecb.zip | |
Fix pci_get_bus_and_slot removed in kernel 4.17
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/kernpcidev.patch | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ca0520f32a8f..d09a30f98a74 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -94,9 +94,7 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; - - + ++ [ ./qtx11extras.patch ./kernpcidev.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch new file mode 100644 index 000000000000..5192227d7d01 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch @@ -0,0 +1,18 @@ +diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +index b8019f7..b7d2e39 100644 +--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL"); + MODULE_VERSION(VBOX_VERSION_STRING); + #endif + +- +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) ++# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) ++# define PCI_DEV_PUT(x) pci_dev_put(x) ++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) + # define PCI_DEV_PUT(x) pci_dev_put(x) + # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) |