From f6f19917a8d125bdb99c92d2760875489a40f944 Mon Sep 17 00:00:00 2001 From: wllenyj Date: Mon, 19 Sep 2022 18:16:26 +0800 Subject: [PATCH] dragonball: update dragonball-sandbox dependencies Updated vmm-sys-util to 0.10.0 Updated virtio-queue to 0.4.0 Updated vm-memory to 0.9.0 Updated linux-loader to 0.5.0 Fixes: #5194 Signed-off-by: wllenyj --- src/dragonball/Cargo.toml | 27 +++++++++++---------- src/dragonball/Makefile | 2 -- src/dragonball/src/address_space_manager.rs | 4 +-- src/dragonball/src/device_manager/mod.rs | 4 +-- src/runtime-rs/Cargo.toml | 16 ++++++------ 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/dragonball/Cargo.toml b/src/dragonball/Cargo.toml index df8286bfee..01d11a5923 100644 --- a/src/dragonball/Cargo.toml +++ b/src/dragonball/Cargo.toml @@ -26,7 +26,7 @@ kvm-bindings = "0.5.0" kvm-ioctls = "0.11.0" lazy_static = "1.2" libc = "0.2.39" -linux-loader = "0.4.0" +linux-loader = "0.5.0" log = "0.4.14" nix = "0.24.2" seccompiler = "0.2.0" @@ -36,9 +36,9 @@ serde_json = "1.0.9" slog = "2.5.2" slog-scope = "4.4.0" thiserror = "1" -vmm-sys-util = "0.9.0" -virtio-queue = { version = "0.1.0", optional = true } -vm-memory = { version = "0.7.0", features = ["backend-mmap"] } +vmm-sys-util = "0.10.0" +virtio-queue = { version = "0.4.0", optional = true } +vm-memory = { version = "0.9.0", features = ["backend-mmap"] } [dev-dependencies] slog-term = "2.9.0" @@ -46,7 +46,7 @@ slog-async = "2.7.0" [features] acpi = [] -atomic-guest-memory = [] +atomic-guest-memory = [ "vm-memory/backend-atomic" ] hotplug = ["virtio-vsock"] virtio-vsock = ["dbs-virtio-devices/virtio-vsock", "virtio-queue"] virtio-blk = ["dbs-virtio-devices/virtio-blk", "virtio-queue"] @@ -55,11 +55,12 @@ virtio-net = ["dbs-virtio-devices/virtio-net", "virtio-queue"] virtio-fs = ["dbs-virtio-devices/virtio-fs", "virtio-queue", "atomic-guest-memory"] [patch.'crates-io'] -dbs-device = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-interrupt = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-legacy-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-upcall = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-utils = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-virtio-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-boot = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-arch = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } +dbs-device = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-interrupt = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-legacy-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-upcall = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-utils = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-virtio-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-boot = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-arch = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-address-space = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index 8acd29de57..ca4216b1f7 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile @@ -5,8 +5,6 @@ default: build build: - # FIXME: This line will be removed when we solve the vm-memory dependency problem in Dragonball Sandbox - cargo update -p vm-memory:0.8.0 --precise 0.7.0 cargo build --all-features check: clippy format diff --git a/src/dragonball/src/address_space_manager.rs b/src/dragonball/src/address_space_manager.rs index 9992833e0c..bcc1083a9d 100644 --- a/src/dragonball/src/address_space_manager.rs +++ b/src/dragonball/src/address_space_manager.rs @@ -33,9 +33,9 @@ use log::{debug, error, info, warn}; use nix::sys::mman; use nix::unistd::dup; #[cfg(feature = "atomic-guest-memory")] -use vm_memory::atomic::GuestMemoryAtomic; +use vm_memory::GuestMemoryAtomic; use vm_memory::{ - Address, FileOffset, GuestAddress, GuestAddressSpace, GuestMemoryMmap, GuestMemoryRegion, + address::Address, FileOffset, GuestAddress, GuestAddressSpace, GuestMemoryMmap, GuestMemoryRegion, GuestRegionMmap, GuestUsize, MemoryRegionAddress, MmapRegion, }; diff --git a/src/dragonball/src/device_manager/mod.rs b/src/dragonball/src/device_manager/mod.rs index 43c237d4ce..3c98d9ffa5 100644 --- a/src/dragonball/src/device_manager/mod.rs +++ b/src/dragonball/src/device_manager/mod.rs @@ -147,13 +147,13 @@ pub type Result = ::std::result::Result; /// Type of the dragonball virtio devices. #[cfg(feature = "dbs-virtio-devices")] pub type DbsVirtioDevice = Box< - dyn VirtioDevice, + dyn VirtioDevice, >; /// Type of the dragonball virtio mmio devices. #[cfg(feature = "dbs-virtio-devices")] pub type DbsMmioV2Device = - MmioV2Device; + MmioV2Device; /// Struct to support transactional operations for device management. pub struct DeviceManagerTx { diff --git a/src/runtime-rs/Cargo.toml b/src/runtime-rs/Cargo.toml index 470b29a64d..6598aacdcc 100644 --- a/src/runtime-rs/Cargo.toml +++ b/src/runtime-rs/Cargo.toml @@ -4,11 +4,11 @@ members = [ ] [patch.'crates-io'] -dbs-device = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-utils = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-interrupt = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-legacy-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-virtio-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-boot = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-arch = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } -dbs-upcall = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "7a8e832b53d66994d6a16f0513d69f540583dcd0" } +dbs-device = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-utils = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-interrupt = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-legacy-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-virtio-devices = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-boot = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-arch = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" } +dbs-upcall = { git = "https://github.com/openanolis/dragonball-sandbox.git", rev = "c3d7831aee7c3962b8a90f0afbfd0fb7e4d30323" }