File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change 5
5
#[ allow( clippy:: all) ]
6
6
#[ allow( clippy:: undocumented_unsafe_blocks) ]
7
7
pub mod bindings;
8
- pub mod sbi_bindings;
9
8
#[ cfg( feature = "fam-wrappers" ) ]
10
9
pub mod fam_wrappers;
10
+ pub mod sbi_bindings;
11
11
12
12
#[ cfg( feature = "serde" ) ]
13
13
mod serialize;
14
14
15
15
pub use self :: bindings:: * ;
16
- pub use self :: sbi_bindings:: * ;
17
16
#[ cfg( feature = "fam-wrappers" ) ]
18
17
pub use self :: fam_wrappers:: * ;
18
+ pub use self :: sbi_bindings:: * ;
Original file line number Diff line number Diff line change @@ -1696,12 +1696,16 @@ impl VcpuFd {
1696
1696
KVM_EXIT_RISCV_SBI => {
1697
1697
// SAFETY: Safe because the exit_reason (which comes from the kernel) told us
1698
1698
// which union field to use and the type of extension_id is 'enum sbi_ext_id'.
1699
- match unsafe { run. __bindgen_anon_1 . riscv_sbi . extension_id } as u32 {
1699
+ match unsafe { run. __bindgen_anon_1 . riscv_sbi . extension_id } as u32 {
1700
1700
SBI_EXT_0_1_CONSOLE_PUTCHAR => {
1701
+ // SAFETY: Safe because the exit_reason (which comes from the kernel) told us
1702
+ // which union field to use
1701
1703
let ch = unsafe { run. __bindgen_anon_1 . riscv_sbi . args [ 0 ] } ;
1702
1704
Ok ( VcpuExit :: SbiExt0_1ConsolePutchar ( ch) )
1703
1705
}
1704
1706
SBI_EXT_0_1_CONSOLE_GETCHAR => {
1707
+ // SAFETY: Safe because the exit_reason (which comes from the kernel) told us
1708
+ // which union field to use
1705
1709
let ch = unsafe { & mut run. __bindgen_anon_1 . riscv_sbi . ret [ ..1 ] } ;
1706
1710
Ok ( VcpuExit :: SbiExt0_1ConsoleGetchar ( ch) )
1707
1711
}
You can’t perform that action at this time.
0 commit comments