-
Notifications
You must be signed in to change notification settings - Fork 127
Add riscv64 sbi bindings #345
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+114
−0
Closed
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -184,6 +184,10 @@ pub enum VcpuExit<'a> { | |
/// size | ||
size: u64, | ||
}, | ||
/// Corresponds to SBI_EXT_0_1_CONSOLE_PUTCHAR. | ||
SbiExt0_1ConsolePutchar(u64), | ||
/// Corresponds to SBI_EXT_0_1_CONSOLE_GETCHAR. | ||
SbiExt0_1ConsoleGetchar(&'a mut [u64]), | ||
/// Corresponds to an exit reason that is unknown from the current version | ||
/// of the kvm-ioctls crate. Let the consumer decide about what to do with | ||
/// it. | ||
|
@@ -1688,6 +1692,26 @@ impl VcpuFd { | |
Ok(VcpuExit::IoapicEoi(eoi.vector)) | ||
} | ||
KVM_EXIT_HYPERV => Ok(VcpuExit::Hyperv), | ||
#[cfg(target_arch = "riscv64")] | ||
KVM_EXIT_RISCV_SBI => { | ||
// SAFETY: Safe because the exit_reason (which comes from the kernel) told us | ||
// which union field to use and the type of extension_id is 'enum sbi_ext_id'. | ||
match unsafe { run.__bindgen_anon_1.riscv_sbi.extension_id } as u32 { | ||
SBI_EXT_0_1_CONSOLE_PUTCHAR => { | ||
// SAFETY: Safe because the exit_reason (which comes from the kernel) told us | ||
// which union field to use | ||
let ch = unsafe { run.__bindgen_anon_1.riscv_sbi.args[0] }; | ||
Ok(VcpuExit::SbiExt0_1ConsolePutchar(ch)) | ||
} | ||
SBI_EXT_0_1_CONSOLE_GETCHAR => { | ||
// SAFETY: Safe because the exit_reason (which comes from the kernel) told us | ||
// which union field to use | ||
let ch = unsafe { &mut run.__bindgen_anon_1.riscv_sbi.ret[..1] }; | ||
Ok(VcpuExit::SbiExt0_1ConsoleGetchar(ch)) | ||
} | ||
r => Ok(VcpuExit::Unsupported(r)), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this match arm correct, maybe |
||
} | ||
} | ||
r => Ok(VcpuExit::Unsupported(r)), | ||
} | ||
} else { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think these should be handled at the KVM crate level - they should be done by the VMM.