Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 646468 | Differences between
and this patch

Collapse All | Expand All

(-)a/vboxguest/VBoxGuest-linux.c (-8 / +8 lines)
Lines 1058-1064 Link Here
1058
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
1058
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
1059
1059
1060
/** log and dbg_log parameter setter. */
1060
/** log and dbg_log parameter setter. */
1061
static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
1061
static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
1062
{
1062
{
1063
    if (g_fLoggerCreated)
1063
    if (g_fLoggerCreated)
1064
    {
1064
    {
Lines 1073-1079 Link Here
1073
}
1073
}
1074
1074
1075
/** log and dbg_log parameter getter. */
1075
/** log and dbg_log parameter getter. */
1076
static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
1076
static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
1077
{
1077
{
1078
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1078
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1079
    *pszBuf = '\0';
1079
    *pszBuf = '\0';
Lines 1084-1090 Link Here
1084
1084
1085
1085
1086
/** log and dbg_log_flags parameter setter. */
1086
/** log and dbg_log_flags parameter setter. */
1087
static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
1087
static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
1088
{
1088
{
1089
    if (g_fLoggerCreated)
1089
    if (g_fLoggerCreated)
1090
    {
1090
    {
Lines 1098-1104 Link Here
1098
}
1098
}
1099
1099
1100
/** log and dbg_log_flags parameter getter. */
1100
/** log and dbg_log_flags parameter getter. */
1101
static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
1101
static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
1102
{
1102
{
1103
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1103
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1104
    *pszBuf = '\0';
1104
    *pszBuf = '\0';
Lines 1109-1115 Link Here
1109
1109
1110
1110
1111
/** log and dbg_log_dest parameter setter. */
1111
/** log and dbg_log_dest parameter setter. */
1112
static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
1112
static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
1113
{
1113
{
1114
    if (g_fLoggerCreated)
1114
    if (g_fLoggerCreated)
1115
    {
1115
    {
Lines 1123-1129 Link Here
1123
}
1123
}
1124
1124
1125
/** log and dbg_log_dest parameter getter. */
1125
/** log and dbg_log_dest parameter getter. */
1126
static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
1126
static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
1127
{
1127
{
1128
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1128
    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
1129
    *pszBuf = '\0';
1129
    *pszBuf = '\0';
Lines 1134-1140 Link Here
1134
1134
1135
1135
1136
/** r3_log_to_host parameter setter. */
1136
/** r3_log_to_host parameter setter. */
1137
static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
1137
static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
1138
{
1138
{
1139
    if (    pszValue == NULL
1139
    if (    pszValue == NULL
1140
        || *pszValue == '\0'
1140
        || *pszValue == '\0'
Lines 1152-1158 Link Here
1152
}
1152
}
1153
1153
1154
/** r3_log_to_host parameter getter. */
1154
/** r3_log_to_host parameter getter. */
1155
static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
1155
static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
1156
{
1156
{
1157
    strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
1157
    strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
1158
    return strlen(pszBuf);
1158
    return strlen(pszBuf);
(-)a/vboxvideo/vbox_mode.c (-1 / +1 lines)
Lines 396-402 Link Here
396
396
397
	/* pick the encoder ids */
397
	/* pick the encoder ids */
398
	if (enc_id)
398
	if (enc_id)
399
		return drm_encoder_find(connector->dev, enc_id);
399
		return drm_encoder_find(connector->dev, NULL, enc_id);
400
400
401
	return NULL;
401
	return NULL;
402
}
402
}

Return to bug 646468