Commit 642b122

committed

vboxdrv: Introduce initial support for kernel 6.16, bugref:10908.

svn:sync-xref-src-repo-rev: r169194

1 parent f4055d9 commit 642b122Copy full SHA for 642b122

File tree

1 file changed

-3

lines changed

src/VBox/HostDrivers/Support/linux
- SUPDrv-linux.c

1 file changed

-3

lines changed

`‎src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: SUPDrv-linux.c 109469 2025-05-08 09:13:54Z knut.osmundsen@oracle.com $ */`
	`1`	`+/* $Id: SUPDrv-linux.c 109840 2025-06-12 11:20:54Z vadim.galitsyn@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* VBoxDrv - The VirtualBox Support Driver - Linux specifics.`
`4`	`4`	`*/`
`@@ -112,6 +112,12 @@`
`112`	`112`	`# define VBOX_EXTRA_VERSION_STRING ""`
`113`	`113`	`#endif`
`114`	`114`
	`115`	`+/* Macro was renamed in 6.16. */`
	`116`	`+# if RTLNX_VER_MIN(6,16,0)`
	`117`	`+# define VBOX_RDMSR_SAFE rdmsrq_safe`
	`118`	`+# else`
	`119`	`+# define VBOX_RDMSR_SAFE rdmsrl_safe`
	`120`	`+# endif`
`115`	`121`
`116`	`122`	`/*********************************************************************************************************************************`
`117`	`123`	`* Structures and Typedefs *`
`@@ -1579,7 +1585,7 @@ static DECLCALLBACK(void) supdrvLnxMsrProberModifyOnCpu(RTCPUID idCpu, void *pvU`
`1579`	`1585`	`if (!fFaster)`
`1580`	`1586`	`ASMWriteBackAndInvalidateCaches();`
`1581`	`1587`
`1582`		`- rcBefore = rdmsrl_safe(uMsr, &uBefore);`
	`1588`	`+ rcBefore = VBOX_RDMSR_SAFE(uMsr, &uBefore);`
`1583`	`1589`	`if (rcBefore >= 0)`
`1584`	`1590`	`{`
`1585`	`1591`	`register uint64_t uRestore = uBefore;`
`@@ -1588,7 +1594,7 @@ static DECLCALLBACK(void) supdrvLnxMsrProberModifyOnCpu(RTCPUID idCpu, void *pvU`
`1588`	`1594`	`uWritten \|= pReq->u.In.uArgs.Modify.fOrMask;`
`1589`	`1595`
`1590`	`1596`	`rcWrite = wrmsr_safe(uMsr, RT_LODWORD(uWritten), RT_HIDWORD(uWritten));`
`1591`		`- rcAfter = rdmsrl_safe(uMsr, &uAfter);`
	`1597`	`+ rcAfter = VBOX_RDMSR_SAFE(uMsr, &uAfter);`
`1592`	`1598`	`rcRestore = wrmsr_safe(uMsr, RT_LODWORD(uRestore), RT_HIDWORD(uRestore));`
`1593`	`1599`
`1594`	`1600`	`if (!fFaster)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 642b122

File tree

1 file changed

1 file changed

`‎src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c‎`

0 commit comments