diff --git a/.cargo/config b/.cargo/config index 8255437e27dbb028763a02b953b2ed35d0e2a847..d7f342049bba2c9c7dc247787d0e505f5d3eea70 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,3 @@ [build] -target = "aarch64-tx2.json" +target = "aarch64.json" rustflags = ["-C", "llvm-args=-global-isel=false"] diff --git a/.gitignore b/.gitignore index ebb81a74e5edae09f8b21f62af028b1bc0366321..465bf760f76b05693be44121e6bf1d03940b899f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ build/ pi4_upload_release *.img *.dts -*.dtb +/*.dtb diff --git a/README.ch.md b/README.ch.md index 7f17aa4b97cee0e65f8250cfde2bac727e5873e7..3d47ddfd091aae89eddbeda435eeec8b6b5c0e45 100644 --- a/README.ch.md +++ b/README.ch.md @@ -67,6 +67,18 @@ insmod tools/shyper.ko sudo tools/shyper system daemon [mediated-cfg.json] & ``` +mediated-cfg.json用于配置其他guest VM的virtio中介磁盘,示例如下: + +``` +{ + "mediated": [ + "/dev/sda2", + "/dev/nvme0n1p2", + "~/vm0.img" + ] +} +``` + **Step 3**: 通过配置文件来配置一个客户虚拟机 ```bash diff --git a/README.md b/README.md index 94d1f8d1c6a91cc2e38a19a3c89c6ddb4294301d..92a3491cb319e32842a3c9ec45c4e11a129a72fa 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,18 @@ insmod tools/shyper.ko sudo tools/shyper system daemon [mediated-cfg.json] & ``` +mediated-cfg.json is used for guest VM as virtio block. For example: + +``` +{ + "mediated": [ + "/dev/sda2", + "/dev/nvme0n1p2", + "~/vm0.img" + ] +} +``` + **Step 3**: Configure a VM through profile ```bash diff --git a/gdb/aarch64.gdb b/gdb/aarch64.gdb index c0df4c0bfb32a20f67ea813fe92bbddec3f8d65f..35130f1a8e901d5c815aedc510a6dd9cf51a9398 100644 --- a/gdb/aarch64.gdb +++ b/gdb/aarch64.gdb @@ -1,5 +1,5 @@ target remote 127.0.0.1:1234 -file target/aarch64-qemu/debug/rust_shyper +file target/aarch64/debug/rust_shyper break *0x40080000 display/i $pc set confirm off diff --git a/image/pi4_fin.dtb b/image/pi4_fin.dtb new file mode 100644 index 0000000000000000000000000000000000000000..d855798972284675732077a5ff19d80a5acbdbc9 Binary files /dev/null and b/image/pi4_fin.dtb differ diff --git a/tools/shyper_pi4.ko b/tools/shyper_pi4.ko new file mode 100644 index 0000000000000000000000000000000000000000..8f3657dc760bb5c80b3ade5ba3c14afa3ba5c16f Binary files /dev/null and b/tools/shyper_pi4.ko differ