update arceos (Starry-OS#60)

AsakuraMizu · web-flow · commit 97c5224cf98f · 2025-11-29T01:36:55.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -115,7 +115,7 @@ qemu = [
 ]
 smp = ["axfeat/smp", "axplat-riscv64-visionfive2?/smp"]
 
-vf2 = ["dep:axplat-riscv64-visionfive2", "axfeat/driver-sdmmc-gpt"]
+vf2 = ["dep:axplat-riscv64-visionfive2", "axfeat/driver-sdmmc"]
 
 [dependencies]
 axdriver.workspace = true
diff --git a/api/src/socket.rs b/api/src/socket.rs
@@ -220,7 +220,7 @@ impl SocketAddrExt for VsockAddr {
             return Err(AxError::from(LinuxError::EAFNOSUPPORT));
         }
         Ok(VsockAddr {
-            cid: addr_vsock.svm_cid,
+            cid: addr_vsock.svm_cid as _,
             port: addr_vsock.svm_port,
         })
     }
@@ -230,7 +230,7 @@ impl SocketAddrExt for VsockAddr {
             svm_family: AF_VSOCK as _,
             svm_reserved1: 0,
             svm_port: self.port,
-            svm_cid: self.cid,
+            svm_cid: self.cid as _,
             svm_zero: [0_u8; 4],
         };
         fill_addr(addr, addrlen, unsafe { cast_to_slice(&sockvm_addr) })
diff --git a/arceos b/arceos
@@ -1 +1 @@
-Subproject commit 77f3f781a1f65216e45d25bba8b13f85240a7cd5
+Subproject commit c67b5ec714f308e6c7c4883ffb7ff51fe59f46fc

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ qemu = [`
`115`	`115`	`]`
`116`	`116`	`smp = ["axfeat/smp", "axplat-riscv64-visionfive2?/smp"]`
`117`	`117`
`118`		`-vf2 = ["dep:axplat-riscv64-visionfive2", "axfeat/driver-sdmmc-gpt"]`
	`118`	`+vf2 = ["dep:axplat-riscv64-visionfive2", "axfeat/driver-sdmmc"]`
`119`	`119`
`120`	`120`	`[dependencies]`
`121`	`121`	`axdriver.workspace = true`