Merge pull request #1348 from hermit-os/virtio-spec-release

refactor: migrate to virtio-spec release
hermit-os · Aug 2, 2024 · b2d8af5 · b2d8af5
2 parents 1e93e98 + b7e1f48
commit b2d8af5
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 3,652 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,7 +74,7 @@ mmap = []
 
 [dependencies]
 hermit-macro = { path = "hermit-macro" }
-virtio = { package = "virtio-spec", path = "virtio-spec", features = ["alloc", "mmio", "nightly", "zerocopy"] }
+virtio = { package = "virtio-spec", version = "0.1", features = ["alloc", "mmio", "nightly", "zerocopy"] }
 ahash = { version = "0.8", default-features = false }
 align-address = "0.3"
 anstyle = { version = "1", default-features = false }
@@ -165,7 +165,6 @@ llvm-tools = "0.1"
 [workspace]
 members = [
     "hermit-macro",
-    "virtio-spec",
 	"xtask",
 ]
 exclude = [

diff --git a/src/arch/riscv64/kernel/devicetree.rs b/src/arch/riscv64/kernel/devicetree.rs
@@ -3,7 +3,7 @@ use core::ptr::NonNull;
 
 use fdt::Fdt;
 #[cfg(all(feature = "tcp", not(feature = "pci")))]
-use virtio::mmio::{DeviceRegisterVolatileFieldAccess, DeviceRegisters};
+use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
 #[cfg(all(feature = "tcp", not(feature = "pci")))]
 use volatile::VolatileRef;
 

diff --git a/src/arch/x86_64/kernel/mmio.rs b/src/arch/x86_64/kernel/mmio.rs
@@ -5,7 +5,7 @@ use core::{ptr, str};
 
 use align_address::Align;
 use hermit_sync::{without_interrupts, InterruptTicketMutex};
-use virtio::mmio::{DeviceRegisterVolatileFieldAccess, DeviceRegisters};
+use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
 use volatile::VolatileRef;
 
 use crate::arch::x86_64::mm::paging::{

diff --git a/src/drivers/net/virtio/mmio.rs b/src/drivers/net/virtio/mmio.rs
@@ -7,7 +7,7 @@ use alloc::vec::Vec;
 use core::str::FromStr;
 
 use smoltcp::phy::ChecksumCapabilities;
-use virtio::mmio::{DeviceRegisterVolatileFieldAccess, DeviceRegisters};
+use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
 use volatile::VolatileRef;
 
 use crate::drivers::net::virtio::{CtrlQueue, NetDevCfg, RxQueues, TxQueues, VirtioNetDriver};

diff --git a/src/drivers/virtio/transport/mmio.rs b/src/drivers/virtio/transport/mmio.rs
@@ -6,7 +6,7 @@
 use core::mem;
 
 use virtio::mmio::{
-	DeviceRegisterVolatileFieldAccess, DeviceRegisterVolatileWideFieldAccess, DeviceRegisters,
+	DeviceRegisters, DeviceRegistersVolatileFieldAccess, DeviceRegistersVolatileWideFieldAccess,
 	InterruptStatus, NotificationData,
 };
 use virtio::{le32, DeviceStatus};

diff --git a/virtio-spec/Cargo.toml b/virtio-spec/Cargo.toml
diff --git a/virtio-spec/rustfmt.toml b/virtio-spec/rustfmt.toml