-
Notifications
You must be signed in to change notification settings - Fork 1
/
linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
87 lines (74 loc) · 3.64 KB
/
linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
diff -urN VBoxGuestAdditions-amd64.orig/src/vboxguest-5.2.6/vboxguest/VBoxGuest-linux.c VBoxGuestAdditions-amd64/src/vboxguest-5.2.6/vboxguest/VBoxGuest-linux.c
--- VBoxGuestAdditions-amd64.orig/src/vboxguest-5.2.6/vboxguest/VBoxGuest-linux.c 2018-01-15 21:51:01.000000000 +0800
+++ VBoxGuestAdditions-amd64/src/vboxguest-5.2.6/vboxguest/VBoxGuest-linux.c 2018-01-19 23:51:11.000000000 +0800
@@ -1058,7 +1058,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
/** log and dbg_log parameter setter. */
-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
{
if (g_fLoggerCreated)
{
@@ -1073,7 +1073,7 @@
}
/** log and dbg_log parameter getter. */
-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
{
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
*pszBuf = '\0';
@@ -1084,7 +1084,7 @@
/** log and dbg_log_flags parameter setter. */
-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
{
if (g_fLoggerCreated)
{
@@ -1098,7 +1098,7 @@
}
/** log and dbg_log_flags parameter getter. */
-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
{
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
*pszBuf = '\0';
@@ -1109,7 +1109,7 @@
/** log and dbg_log_dest parameter setter. */
-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
{
if (g_fLoggerCreated)
{
@@ -1123,7 +1123,7 @@
}
/** log and dbg_log_dest parameter getter. */
-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
{
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
*pszBuf = '\0';
@@ -1134,7 +1134,7 @@
/** r3_log_to_host parameter setter. */
-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
{
if ( pszValue == NULL
|| *pszValue == '\0'
@@ -1152,7 +1152,7 @@
}
/** r3_log_to_host parameter getter. */
-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
{
strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
return strlen(pszBuf);
diff -urN VBoxGuestAdditions-amd64.orig/src/vboxguest-5.2.6/vboxvideo/vbox_mode.c VBoxGuestAdditions-amd64/src/vboxguest-5.2.6/vboxvideo/vbox_mode.c
--- VBoxGuestAdditions-amd64.orig/src/vboxguest-5.2.6/vboxvideo/vbox_mode.c 2018-01-15 21:51:01.000000000 +0800
+++ VBoxGuestAdditions-amd64/src/vboxguest-5.2.6/vboxvideo/vbox_mode.c 2018-01-20 00:00:09.716758642 +0800
@@ -397,7 +397,7 @@
/* pick the encoder ids */
if (enc_id)
- return drm_encoder_find(connector->dev, enc_id);
+ return drm_encoder_find(connector->dev, NULL, enc_id);
return NULL;
}