diff options
Diffstat (limited to 'meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff')
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file mode 100644 index 000000000..23a9021f0 --- /dev/null +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | |||
@@ -0,0 +1,90 @@ | |||
1 | Based on: | ||
2 | https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | ||
3 | |||
4 | Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible) | ||
5 | |||
6 | --- vbox_module.orig/vboxvideo/vbox_mode.c 2018-02-18 16:42:47.000000000 +0000 | ||
7 | +++ vbox_module/vboxvideo/vbox_mode.c 2018-02-18 16:55:14.466029313 +0000 | ||
8 | @@ -396,7 +396,7 @@ | ||
9 | |||
10 | /* pick the encoder ids */ | ||
11 | if (enc_id) | ||
12 | - return drm_encoder_find(connector->dev, enc_id); | ||
13 | + return drm_encoder_find(connector->dev, NULL, enc_id); | ||
14 | |||
15 | return NULL; | ||
16 | } | ||
17 | --- vbox_module.orig/vboxguest/VBoxGuest-linux.c 2018-02-18 16:42:28.000000000 +0000 | ||
18 | +++ vbox_module/vboxguest/VBoxGuest-linux.c 2018-02-18 16:54:36.793049118 +0000 | ||
19 | @@ -1058,7 +1058,7 @@ | ||
20 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) | ||
21 | |||
22 | /** log and dbg_log parameter setter. */ | ||
23 | -static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam) | ||
24 | +static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam) | ||
25 | { | ||
26 | if (g_fLoggerCreated) | ||
27 | { | ||
28 | @@ -1073,7 +1073,7 @@ | ||
29 | } | ||
30 | |||
31 | /** log and dbg_log parameter getter. */ | ||
32 | -static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam) | ||
33 | +static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam) | ||
34 | { | ||
35 | PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); | ||
36 | *pszBuf = '\0'; | ||
37 | @@ -1084,7 +1084,7 @@ | ||
38 | |||
39 | |||
40 | /** log and dbg_log_flags parameter setter. */ | ||
41 | -static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam) | ||
42 | +static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam) | ||
43 | { | ||
44 | if (g_fLoggerCreated) | ||
45 | { | ||
46 | @@ -1098,7 +1098,7 @@ | ||
47 | } | ||
48 | |||
49 | /** log and dbg_log_flags parameter getter. */ | ||
50 | -static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam) | ||
51 | +static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam) | ||
52 | { | ||
53 | PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); | ||
54 | *pszBuf = '\0'; | ||
55 | @@ -1109,7 +1109,7 @@ | ||
56 | |||
57 | |||
58 | /** log and dbg_log_dest parameter setter. */ | ||
59 | -static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam) | ||
60 | +static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam) | ||
61 | { | ||
62 | if (g_fLoggerCreated) | ||
63 | { | ||
64 | @@ -1123,7 +1123,7 @@ | ||
65 | } | ||
66 | |||
67 | /** log and dbg_log_dest parameter getter. */ | ||
68 | -static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam) | ||
69 | +static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam) | ||
70 | { | ||
71 | PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); | ||
72 | *pszBuf = '\0'; | ||
73 | @@ -1134,7 +1134,7 @@ | ||
74 | |||
75 | |||
76 | /** r3_log_to_host parameter setter. */ | ||
77 | -static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam) | ||
78 | +static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam) | ||
79 | { | ||
80 | if ( pszValue == NULL | ||
81 | || *pszValue == '\0' | ||
82 | @@ -1152,7 +1152,7 @@ | ||
83 | } | ||
84 | |||
85 | /** r3_log_to_host parameter getter. */ | ||
86 | -static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam) | ||
87 | +static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam) | ||
88 | { | ||
89 | strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); | ||
90 | return strlen(pszBuf); | ||