Attachment #888904 for bug #926766

View | Details | Raw Unified | Return to bug 926766
Collapse All | Expand All




            RTLogGroupSettings(pLogger, pszValue);
    }
    else if (pParam->name[0] != 'd')
        RTStrCopy(&g_szLogGrp[0], sizeof(g_szLogGrp), pszValue);

    return 0;
}


            RTLogFlags(pLogger, pszValue);
    }
    else if (pParam->name[0] != 'd')
        RTStrCopy(&g_szLogFlags[0], sizeof(g_szLogFlags), pszValue);
    return 0;
}


            RTLogDestinations(pLogger, pszValue);
    }
    else if (pParam->name[0] != 'd')
        RTStrCopy(&g_szLogDst[0], sizeof(g_szLogDst), pszValue);
    return 0;
}


Lines 538-546 int vbox_gem_prime_mmap(struct drm_gem_object *obj, Link Here

(-)a/src/VBox/Additions/linux/drm/vbox_drv.h (-2 lines)
538	int vbox_irq_init(struct vbox_private *vbox);	538	int vbox_irq_init(struct vbox_private *vbox);
539	void vbox_irq_fini(struct vbox_private *vbox);	539	void vbox_irq_fini(struct vbox_private *vbox);
540	void vbox_report_hotplug(struct vbox_private *vbox);	540	void vbox_report_hotplug(struct vbox_private *vbox);
541	#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1) && !RTLNX_SUSE_MAJ_PREREQ(15,5)
542	irqreturn_t vbox_irq_handler(int irq, void *arg);	541	irqreturn_t vbox_irq_handler(int irq, void *arg);
543	#endif
544		542
545	/* vbox_hgsmi.c */	543	/* vbox_hgsmi.c */
546	void hgsmi_buffer_alloc(struct gen_pool guest_pool, size_t size,	544	void hgsmi_buffer_alloc(struct gen_pool guest_pool, size_t size,




};

/** file_operations::mmap wrapper for logging purposes. */
static int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma)
{
    int rc;
    SFLOGFLOW(("vbsf_reg_mmap: file=%p vma=%p\n", file, vma));

}

# if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(9,3, 9,99)
static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
                     unsigned len, struct page **pagep, void **fsdata)
{
    vbsf_write_begin_warn(pos, len, 0);
    return simple_write_begin(file, mapping, pos, len, pagep, fsdata);
}
# else
static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
                     unsigned len, unsigned flags, struct page **pagep, void **fsdata)
{
    vbsf_write_begin_warn(pos, len, flags);




    switch (opt) {
    case Opt_iocharset:
    case Opt_nls:
        RTStrCopy(info->nls_name, sizeof(info->nls_name), param->string);
        break;
    case Opt_uid:
        info->uid = result.uint_32;

            printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32);
        break;
    case Opt_tag:
        RTStrCopy(info->szTag, sizeof(info->szTag), param->string);
        break;
    default:
        return invalf(fc, "Invalid mount option: '%s'", param->key);

    }

    /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */
    RTStrCopy(info->name, sizeof(info->name), fc->source);

# if RTLNX_VER_MAX(5,3,0)
    return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux);
- 

Return to bug 926766

Lines 1410-1417 static int vgdrvLinuxParamLogGrpSet(const char *pszValue, CONST_4_15 struct kern Link Here

(-)a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (-4 / +3 lines)
1410	RTLogGroupSettings(pLogger, pszValue);	1410	RTLogGroupSettings(pLogger, pszValue);
1411	}	1411	}
1412	else if (pParam->name[0] != 'd')	1412	else if (pParam->name[0] != 'd')
1413	strlcpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp));	1413	RTStrCopy(&g_szLogGrp[0], sizeof(g_szLogGrp), pszValue);
1414
1415	return 0;	1414	return 0;
1416	}	1415	}
1417		1416
Lines 1436-1442 static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, CONST_4_15 struct ke Link Here
1436	RTLogFlags(pLogger, pszValue);	1435	RTLogFlags(pLogger, pszValue);
1437	}	1436	}
1438	else if (pParam->name[0] != 'd')	1437	else if (pParam->name[0] != 'd')
1439	strlcpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags));	1438	RTStrCopy(&g_szLogFlags[0], sizeof(g_szLogFlags), pszValue);
1440	return 0;	1439	return 0;
1441	}	1440	}
1442		1441
Lines 1461-1467 static int vgdrvLinuxParamLogDstSet(const char *pszValue, CONST_4_15 struct kern Link Here
1461	RTLogDestinations(pLogger, pszValue);	1460	RTLogDestinations(pLogger, pszValue);
1462	}	1461	}
1463	else if (pParam->name[0] != 'd')	1462	else if (pParam->name[0] != 'd')
1464	strlcpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst));	1463	RTStrCopy(&g_szLogDst[0], sizeof(g_szLogDst), pszValue);
1465	return 0;	1464	return 0;
1466	}	1465	}
1467		1466

Lines 1408-1414 static int vbsf_parse_param(struct fs_context fc, struct fs_parameter param) Link Here

(-)a/src/VBox/Additions/linux/sharedfolders/vfsmod.c (-4 / +3 lines)
1408	switch (opt) {	1408	switch (opt) {
1409	case Opt_iocharset:	1409	case Opt_iocharset:
1410	case Opt_nls:	1410	case Opt_nls:
1411	strlcpy(info->nls_name, param->string, sizeof(info->nls_name));	1411	RTStrCopy(info->nls_name, sizeof(info->nls_name), param->string);
1412	break;	1412	break;
1413	case Opt_uid:	1413	case Opt_uid:
1414	info->uid = result.uint_32;	1414	info->uid = result.uint_32;
Lines 1469-1475 static int vbsf_parse_param(struct fs_context fc, struct fs_parameter param) Link Here
1469	printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32);	1469	printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32);
1470	break;	1470	break;
1471	case Opt_tag:	1471	case Opt_tag:
1472	strlcpy(info->szTag, param->string, sizeof(info->szTag));	1472	RTStrCopy(info->szTag, sizeof(info->szTag), param->string);
1473	break;	1473	break;
1474	default:	1474	default:
1475	return invalf(fc, "Invalid mount option: '%s'", param->key);	1475	return invalf(fc, "Invalid mount option: '%s'", param->key);
Lines 1528-1534 static int vbsf_get_tree(struct fs_context *fc) Link Here
1528	}	1528	}
1529		1529
1530	/* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */	1530	/* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */
1531	strlcpy(info->name, fc->source, sizeof(info->name));	1531	RTStrCopy(info->name, sizeof(info->name), fc->source);
1532		1532
1533	# if RTLNX_VER_MAX(5,3,0)	1533	# if RTLNX_VER_MAX(5,3,0)
1534	return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux);	1534	return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux);
1535	-

Lines 3505-3511 static struct vm_operations_struct const g_LoggingVmOpsTemplate = { Link Here

(-)a/src/VBox/Additions/linux/sharedfolders/regops.c (-3 / +3 lines)
3505	};	3505	};
3506		3506
3507	/** file_operations::mmap wrapper for logging purposes. */	3507	/** file_operations::mmap wrapper for logging purposes. */
3508	extern int vbsf_reg_mmap(struct file file, struct vm_area_struct vma)	3508	static int vbsf_reg_mmap(struct file file, struct vm_area_struct vma)
3509	{	3509	{
3510	int rc;	3510	int rc;
3511	SFLOGFLOW(("vbsf_reg_mmap: file=%p vma=%p\n", file, vma));	3511	SFLOGFLOW(("vbsf_reg_mmap: file=%p vma=%p\n", file, vma));
Lines 3786-3799 static inline void vbsf_write_begin_warn(loff_t pos, unsigned len, unsigned flag Link Here
3786	}	3786	}
3787		3787
3788	# if RTLNX_VER_MIN(5,19,0) \|\| RTLNX_RHEL_RANGE(9,3, 9,99)	3788	# if RTLNX_VER_MIN(5,19,0) \|\| RTLNX_RHEL_RANGE(9,3, 9,99)
3789	int vbsf_write_begin(struct file file, struct address_space mapping, loff_t pos,	3789	static int vbsf_write_begin(struct file file, struct address_space mapping, loff_t pos,
3790	unsigned len, struct page pagep, void fsdata)	3790	unsigned len, struct page pagep, void fsdata)
3791	{	3791	{
3792	vbsf_write_begin_warn(pos, len, 0);	3792	vbsf_write_begin_warn(pos, len, 0);
3793	return simple_write_begin(file, mapping, pos, len, pagep, fsdata);	3793	return simple_write_begin(file, mapping, pos, len, pagep, fsdata);
3794	}	3794	}
3795	# else	3795	# else
3796	int vbsf_write_begin(struct file file, struct address_space mapping, loff_t pos,	3796	static int vbsf_write_begin(struct file file, struct address_space mapping, loff_t pos,
3797	unsigned len, unsigned flags, struct page pagep, void fsdata)	3797	unsigned len, unsigned flags, struct page pagep, void fsdata)
3798	{	3798	{
3799	vbsf_write_begin_warn(pos, len, flags);	3799	vbsf_write_begin_warn(pos, len, flags);