andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-21 23:56:18 +04:00
Code Issues Projects Releases Wiki Activity

bump rvm version.

Browse Source
This commit is contained in:
gjz010 2021-05-13 23:19:23 +08:00
parent 05303b9c6f
commit b7dc9b0fd2
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/Cargo.lock generated
View File

@ -472,7 +472,7 @@ dependencies = [
"log", "log",
"rlibc", "rlibc",
"uefi", "uefi",
"x86_64 0.11.7", "x86_64",
"xmas-elf", "xmas-elf",
] ]
@ -523,7 +523,7 @@ dependencies = [
"virtio-drivers", "virtio-drivers",
"volatile", "volatile",
"woke", "woke",
"x86_64 0.11.7", "x86_64",
"xmas-elf", "xmas-elf",
] ]
@ -681,7 +681,7 @@ dependencies = [
[[package]] [[package]]
name = "rvm" name = "rvm"
version = "1.2.0" version = "1.2.0"
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383" source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5ccac8b#5ccac8ba6529cf06d5dabb8c137227c36f5ad2eb"
dependencies = [ dependencies = [
"bit-set", "bit-set",
"bit_field 0.10.1", "bit_field 0.10.1",
@ -695,13 +695,13 @@ dependencies = [
"rvm_macros", "rvm_macros",
"spin", "spin",
"x86 0.36.0", "x86 0.36.0",
"x86_64 0.13.6", "x86_64",
] ]
[[package]] [[package]]
name = "rvm_macros" name = "rvm_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383" source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5ccac8b#5ccac8ba6529cf06d5dabb8c137227c36f5ad2eb"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn",
@ -777,7 +777,7 @@ version = "0.4.3"
source = "git+https://github.com/rcore-os/trapframe-rs?rev=bdfe5aa#bdfe5aaebcdd64636c8831c2b8c17e4fede40c0b" source = "git+https://github.com/rcore-os/trapframe-rs?rev=bdfe5aa#bdfe5aaebcdd64636c8831c2b8c17e4fede40c0b"
dependencies = [ dependencies = [
"raw-cpuid 8.0.0", "raw-cpuid 8.0.0",
"x86_64 0.11.7", "x86_64",
] ]
[[package]] [[package]]
@ -793,7 +793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e58fc40dc1712664fc9b0a7bd8ca2f21ab49960924fb245a80a05e1e92f3dfe9" checksum = "e58fc40dc1712664fc9b0a7bd8ca2f21ab49960924fb245a80a05e1e92f3dfe9"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"x86_64 0.11.7", "x86_64",
] ]
[[package]] [[package]]
@ -937,16 +937,6 @@ dependencies = [
"bitflags", "bitflags",
] ]
[[package]]
name = "x86_64"
version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "021b49a4cb0a0d9490265cc169ca816014cbf61d3f3b75424815912977b81871"
dependencies = [
"bit_field 0.9.0",
"bitflags",
]
[[package]] [[package]]
name = "xmas-elf" name = "xmas-elf"
version = "0.7.0" version = "0.7.0"

2
kernel/Cargo.toml
View File

@ -77,7 +77,7 @@ virtio-drivers = { git = "https://github.com/rcore-riscv-hypervisor-dev/virtio-d
volatile = "0.2" volatile = "0.2"
woke = "0.0.2" woke = "0.0.2"
xmas-elf = "0.7" xmas-elf = "0.7"
rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "5cde71c", optional = true } rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "5ccac8b", optional = true }
[target.'cfg(target_arch = "x86_64")'.dependencies] [target.'cfg(target_arch = "x86_64")'.dependencies]
apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" } apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" }

13
kernel/src/rvm/inode.rs
View File

@ -26,10 +26,15 @@ const RVM_VCPU_READ_STATE: u32 = RVM_IO + 0x13;
const RVM_VCPU_WRITE_STATE: u32 = RVM_IO + 0x14; const RVM_VCPU_WRITE_STATE: u32 = RVM_IO + 0x14;
const RVM_VCPU_INTERRUPT: u32 = RVM_IO + 0x15; const RVM_VCPU_INTERRUPT: u32 = RVM_IO + 0x15;
const RVM_RISCV_SET_SSIP: u32 = 0; #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
const RVM_RISCV_CLEAR_SSIP: u32 = 1; mod riscv_intr_constants {
const RVM_RISCV_SET_SEIP: u32 = 2; pub const RVM_RISCV_SET_SSIP: u32 = 0;
const RVM_RISCV_CLEAR_SEIP: u32 = 3; pub const RVM_RISCV_CLEAR_SSIP: u32 = 1;
pub const RVM_RISCV_SET_SEIP: u32 = 2;
pub const RVM_RISCV_CLEAR_SEIP: u32 = 3;
}
#[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
use riscv_intr_constants::*;
pub struct RvmINode { pub struct RvmINode {
guests: RwLock<BTreeMap<usize, Guest>>, guests: RwLock<BTreeMap<usize, Guest>>,

14
kernel/src/rvm/mod.rs
View File

@ -55,12 +55,16 @@ mod rvm_extern_fn {
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
#[rvm::extern_fn(x86_all_traps_handler_addr)] #[rvm::extern_fn(is_host_timer_interrupt)]
unsafe fn rvm_x86_all_traps_handler_addr() -> usize { fn rvm_x86_is_host_timer_interrupt(_vec: u8) -> bool {
extern "C" { // TODO: fill in the blanks.
fn __alltraps(); false
} }
__alltraps as usize #[cfg(target_arch = "x86_64")]
#[rvm::extern_fn(is_host_serial_interrupt)]
fn rvm_x86_is_host_serial_interrupt(_vec: u8) -> bool {
// TODO: fill in the blanks.
false
} }
#[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))] #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]

2
user

@ -1 +1 @@
Subproject commit b4a7bd80a9dd34a9e4fe37fc623f0c33e6e23880 Subproject commit 1c5e883fcfb0dc18895dce7b1931d7cf3a4261b1