Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-25 02:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Ext2 fs and basic bio layer

Browse Source
This commit is contained in:
LI Qing
2023-09-18 11:47:17 +08:00
committed by Tate, Hongliang Tian
parent 1616f2d32c
commit 9473889c6b
51 changed files with 5346 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
runner/src/main.rs
View File

@ -14,7 +14,6 @@ pub mod gdb;
pub mod machine;
use std::{
fs::OpenOptions,
path::{Path, PathBuf},
process::Command,
};
@ -175,9 +174,11 @@ fn main() {
qemu_cmd.args(qemu_grub_efi::NOIOMMU_DEVICE_ARGS);
}
let fs_image = create_fs_image(args.path.as_path());
// TODO: Add arguments to the runner CLI tool so that the user can specify
// a list of disk drives, each of which may be in a different FS format.
let ext2_image = get_fs_image(&PathBuf::from("regression/build/ext2.img"), 0);
qemu_cmd.arg("-drive");
qemu_cmd.arg(fs_image);
qemu_cmd.arg(ext2_image);
if args.boot_method == BootMethod::Microvm {
let image = microvm::create_bootdev_image(args.path);
@ -221,20 +222,14 @@ fn main() {
}
}
pub fn create_fs_image(path: &Path) -> String {
let mut fs_img_path = path.parent().unwrap().to_str().unwrap().to_string();
fs_img_path.push_str("/fs.img");
let path = Path::new(fs_img_path.as_str());
if path.exists() {
return format!("file={},if=none,format=raw,id=x0", fs_img_path.as_str());
pub fn get_fs_image(path: &Path, drive_id: u32) -> String {
if !path.exists() {
panic!("can not find the fs image")
}
let f = OpenOptions::new()
.read(true)
.write(true)
.create(true)
.open(fs_img_path.as_str())
.unwrap();
// 32MiB
f.set_len(64 * 1024 * 1024).unwrap();
format!("file={},if=none,format=raw,id=x0", fs_img_path.as_str())
format!(
"file={},if=none,format=raw,id=x{}",
path.to_string_lossy(),
drive_id
)
}