forked from pool/virtualbox
96f7e0c1f2
- Update "fixes_for_4.15.patch": remove useless log statement that broke building the vboxvideo guest kernel module - Build and install it again, it's needed for KMS support, i.e. for Xorg's "modesetting" driver to work in the guest (boo#1079221) OBS-URL: https://build.opensuse.org/request/show/572312 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=400
118 lines
4.4 KiB
Diff
118 lines
4.4 KiB
Diff
Index: VirtualBox-5.2.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|
===================================================================
|
|
--- VirtualBox-5.2.6.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|
+++ VirtualBox-5.2.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|
@@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXG
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
|
|
|
|
/** log and dbg_log parameter setter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
if (g_fLoggerCreated)
|
|
{
|
|
@@ -1073,7 +1077,11 @@ static int vgdrvLinuxParamLogGrpSet(cons
|
|
}
|
|
|
|
/** log and dbg_log parameter getter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
|
*pszBuf = '\0';
|
|
@@ -1084,7 +1092,11 @@ static int vgdrvLinuxParamLogGrpGet(char
|
|
|
|
|
|
/** log and dbg_log_flags parameter setter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
if (g_fLoggerCreated)
|
|
{
|
|
@@ -1098,7 +1110,11 @@ static int vgdrvLinuxParamLogFlagsSet(co
|
|
}
|
|
|
|
/** log and dbg_log_flags parameter getter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
|
*pszBuf = '\0';
|
|
@@ -1109,7 +1125,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch
|
|
|
|
|
|
/** log and dbg_log_dest parameter setter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
if (g_fLoggerCreated)
|
|
{
|
|
@@ -1123,7 +1143,11 @@ static int vgdrvLinuxParamLogDstSet(cons
|
|
}
|
|
|
|
/** log and dbg_log_dest parameter getter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
|
*pszBuf = '\0';
|
|
@@ -1134,7 +1158,11 @@ static int vgdrvLinuxParamLogDstGet(char
|
|
|
|
|
|
/** r3_log_to_host parameter setter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
if ( pszValue == NULL
|
|
|| *pszValue == '\0'
|
|
@@ -1152,7 +1180,11 @@ static int vgdrvLinuxParamR3LogToHostSet
|
|
}
|
|
|
|
/** r3_log_to_host parameter getter. */
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
|
|
+#else
|
|
static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
|
|
+#endif
|
|
{
|
|
strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
|
|
return strlen(pszBuf);
|
|
Index: VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
===================================================================
|
|
--- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
+++ VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
@@ -401,7 +401,11 @@ static struct drm_encoder *vbox_best_sin
|
|
|
|
/* pick the encoder ids */
|
|
if (enc_id)
|
|
- return drm_encoder_find(connector->dev, enc_id);
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+ return drm_encoder_find(connector->dev, NULL, enc_id);
|
|
+#else
|
|
+ return drm_encoder_find(connector->dev, enc_id);
|
|
+#endif
|
|
|
|
return NULL;
|
|
}
|