diff --git a/src/dragonball/Cargo.lock b/src/dragonball/Cargo.lock index efec2879be..0e77680243 100644 --- a/src/dragonball/Cargo.lock +++ b/src/dragonball/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -265,6 +265,13 @@ dependencies = [ "typenum", ] +[[package]] +name = "dbs-acpi" +version = "0.1.0" +dependencies = [ + "vm-memory", +] + [[package]] name = "dbs-address-space" version = "0.3.0" @@ -303,6 +310,8 @@ name = "dbs-boot" version = "0.4.0" dependencies = [ "dbs-arch", + "dbs-device", + "device_tree", "kvm-bindings", "kvm-ioctls", "lazy_static", @@ -350,6 +359,7 @@ version = "0.1.0" dependencies = [ "byteorder", "dbs-allocator", + "dbs-arch", "dbs-boot", "dbs-device", "dbs-interrupt", @@ -364,6 +374,16 @@ dependencies = [ "vm-memory", ] +[[package]] +name = "dbs-tdx" +version = "0.1.0" +dependencies = [ + "kvm-bindings", + "serde_json", + "thiserror", + "vmm-sys-util", +] + [[package]] name = "dbs-upcall" version = "0.3.0" @@ -385,6 +405,7 @@ dependencies = [ "libc", "log", "serde", + "serde_json", "thiserror", "timerfd", "vmm-sys-util", @@ -446,6 +467,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "device_tree" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18f717c5c7c2e3483feb64cccebd077245ad6d19007c2db0fd341d38595353c" + [[package]] name = "digest" version = "0.10.7" diff --git a/src/dragonball/Cargo.toml b/src/dragonball/Cargo.toml index 88902ebd51..fb15af4361 100644 --- a/src/dragonball/Cargo.toml +++ b/src/dragonball/Cargo.toml @@ -9,34 +9,68 @@ repository = "https://github.com/kata-containers/kata-containers.git" license = "Apache-2.0" edition = "2018" +[workspace] +members = [ + "dbs_acpi", + "dbs_address_space", + "dbs_allocator", + "dbs_arch", + "dbs_boot", + "dbs_device", + "dbs_interrupt", + "dbs_legacy_devices", + "dbs_pci", + "dbs_tdx", + "dbs_upcall", + "dbs_utils", + "dbs_virtio_devices", +] +resolver = "2" + +# Rust-VMM crates +[workspace.dependencies] +event-manager = "0.2.1" +kvm-bindings = "0.6.0" +kvm-ioctls = "0.12.0" +linux-loader = "0.8.0" +seccompiler = "0.2.0" +vfio-bindings = "0.3.0" +vfio-ioctls = "0.1.0" +virtio-bindings = "0.1.0" +virtio-queue = "0.7.0" +vm-fdt = "0.2.0" +vm-memory = "0.10.0" +vm-superio = "0.5.0" +vmm-sys-util = "0.11.0" + [dependencies] anyhow = "1.0.32" arc-swap = "1.5.0" bytes = "1.1.0" -dbs-address-space = { path = "./src/dbs_address_space" } -dbs-allocator = { path = "./src/dbs_allocator" } -dbs-arch = { path = "./src/dbs_arch" } -dbs-boot = { path = "./src/dbs_boot" } -dbs-device = { path = "./src/dbs_device" } -dbs-interrupt = { path = "./src/dbs_interrupt", features = ["kvm-irq"] } -dbs-legacy-devices = { path = "./src/dbs_legacy_devices" } -dbs-upcall = { path = "./src/dbs_upcall", optional = true } -dbs-utils = { path = "./src/dbs_utils" } -dbs-virtio-devices = { path = "./src/dbs_virtio_devices", optional = true, features = [ - "virtio-mmio", +dbs-address-space = { path = "dbs_address_space" } +dbs-allocator = { path = "dbs_allocator" } +dbs-arch = { path = "dbs_arch" } +dbs-boot = { path = "dbs_boot" } +dbs-device = { path = "dbs_device" } +dbs-interrupt = { path = "dbs_interrupt", features = ["kvm-irq"] } +dbs-legacy-devices = { path = "dbs_legacy_devices" } +dbs-upcall = { path = "dbs_upcall", optional = true } +dbs-utils = { path = "dbs_utils" } +dbs-virtio-devices = { path = "dbs_virtio_devices", optional = true, features = [ + "virtio-mmio", ] } -dbs-pci = { path = "./src/dbs_pci", optional = true } +dbs-pci = { path = "dbs_pci", optional = true } derivative = "2.2.0" -kvm-bindings = "0.6.0" -kvm-ioctls = "0.12.0" +kvm-bindings = { workspace = true } +kvm-ioctls = { workspace = true } lazy_static = "1.2" libc = "0.2.39" -linux-loader = "0.8.0" +linux-loader = {workspace = true} log = "0.4.14" nix = "0.24.2" procfs = "0.12.0" prometheus = { version = "0.13.0", features = ["process"] } -seccompiler = "0.2.0" +seccompiler = {workspace = true} serde = "1.0.27" serde_derive = "1.0.27" serde_json = "1.0.9" @@ -44,13 +78,13 @@ slog = "2.5.2" slog-scope = "4.4.0" thiserror = "1" tracing = "0.1.37" -vmm-sys-util = "0.11.0" -virtio-queue = { version = "0.7.0", optional = true } -vm-memory = { version = "0.10.0", features = ["backend-mmap"] } +vmm-sys-util = {workspace = true} +virtio-queue = { workspace = true, optional = true } +vm-memory = { workspace = true, features = ["backend-mmap"] } crossbeam-channel = "0.5.6" fuse-backend-rs = "0.10.5" -vfio-bindings = { version = "0.3.0", optional = true } -vfio-ioctls = { version = "0.1.0", optional = true } +vfio-bindings = { workspace = true, optional = true } +vfio-ioctls = { workspace = true, optional = true } [dev-dependencies] slog-async = "2.7.0" diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index aead4fda48..e9881a1116 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile @@ -35,7 +35,7 @@ vendor: format: @echo "INFO: rust fmt..." # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. - rustfmt --edition 2018 ./src/dbs_address_space/src/lib.rs ./src/dbs_allocator/src/lib.rs ./src/dbs_arch/src/lib.rs ./src/dbs_boot/src/lib.rs ./src/dbs_device/src/lib.rs ./src/dbs_interrupt/src/lib.rs ./src/dbs_legacy_devices/src/lib.rs ./src/dbs_pci/src/lib.rs ./src/dbs_upcall/src/lib.rs ./src/dbs_utils/src/lib.rs ./src/dbs_virtio_devices/src/lib.rs ./src/lib.rs --check + rustfmt --edition 2018 ./dbs_address_space/src/lib.rs ./dbs_allocator/src/lib.rs ./dbs_arch/src/lib.rs ./dbs_boot/src/lib.rs ./dbs_device/src/lib.rs ./dbs_interrupt/src/lib.rs ./dbs_legacy_devices/src/lib.rs ./dbs_pci/src/lib.rs ./dbs_upcall/src/lib.rs ./dbs_utils/src/lib.rs ./dbs_virtio_devices/src/lib.rs ./src/lib.rs --check clean: cargo clean diff --git a/src/dragonball/README.md b/src/dragonball/README.md index 6535279111..e24292c5b7 100644 --- a/src/dragonball/README.md +++ b/src/dragonball/README.md @@ -20,19 +20,19 @@ and configuration process. - vCPU: [vCPU Document](docs/vcpu.md) - API: [API Document](docs/api.md) - `Upcall`: [`Upcall` Document](docs/upcall.md) -- `dbs_acpi`: [`dbs_acpi` Document](src/dbs_acpi/README.md) -- `dbs_address_space`: [`dbs_address_space` Document](src/dbs_address_space/README.md) -- `dbs_allocator`: [`dbs_allocator` Document](src/dbs_allocator/README.md) -- `dbs_arch`: [`dbs_arch` Document](src/dbs_arch/README.md) -- `dbs_boot`: [`dbs_boot` Document](src/dbs_boot/README.md) -- `dbs_device`: [`dbs_device` Document](src/dbs_device/README.md) -- `dbs_interrupt`: [`dbs_interrput` Document](src/dbs_interrupt/README.md) -- `dbs_legacy_devices`: [`dbs_legacy_devices` Document](src/dbs_legacy_devices/README.md) -- `dbs_tdx`: [`dbs_tdx` Document](src/dbs_tdx/README.md) -- `dbs_upcall`: [`dbs_upcall` Document](src/dbs_upcall/README.md) -- `dbs_utils`: [`dbs_utils` Document](src/dbs_utils/README.md) -- `dbs_virtio_devices`: [`dbs_virtio_devices` Document](src/dbs_virtio_devices/README.md) -- `dbs_pci`: [`dbc_pci` Document](src/dbs_pci/README.md) +- `dbs_acpi`: [`dbs_acpi` Document](dbs_acpi/README.md) +- `dbs_address_space`: [`dbs_address_space` Document](dbs_address_space/README.md) +- `dbs_allocator`: [`dbs_allocator` Document](dbs_allocator/README.md) +- `dbs_arch`: [`dbs_arch` Document](dbs_arch/README.md) +- `dbs_boot`: [`dbs_boot` Document](dbs_boot/README.md) +- `dbs_device`: [`dbs_device` Document](dbs_device/README.md) +- `dbs_interrupt`: [`dbs_interrput` Document](dbs_interrupt/README.md) +- `dbs_legacy_devices`: [`dbs_legacy_devices` Document](dbs_legacy_devices/README.md) +- `dbs_tdx`: [`dbs_tdx` Document](dbs_tdx/README.md) +- `dbs_upcall`: [`dbs_upcall` Document](dbs_upcall/README.md) +- `dbs_utils`: [`dbs_utils` Document](dbs_utils/README.md) +- `dbs_virtio_devices`: [`dbs_virtio_devices` Document](dbs_virtio_devices/README.md) +- `dbs_pci`: [`dbc_pci` Document](dbs_pci/README.md) Currently, the documents are still actively adding. You could see the [official documentation](docs/) page for more details. diff --git a/src/dragonball/src/dbs_acpi/Cargo.toml b/src/dragonball/dbs_acpi/Cargo.toml similarity index 93% rename from src/dragonball/src/dbs_acpi/Cargo.toml rename to src/dragonball/dbs_acpi/Cargo.toml index df5e7867a6..7551f36997 100644 --- a/src/dragonball/src/dbs_acpi/Cargo.toml +++ b/src/dragonball/dbs_acpi/Cargo.toml @@ -11,4 +11,4 @@ keywords = ["dragonball", "acpi", "vmm", "secure-sandbox"] readme = "README.md" [dependencies] -vm-memory = "0.9.0" \ No newline at end of file +vm-memory = {workspace = true} \ No newline at end of file diff --git a/src/dragonball/src/dbs_acpi/README.md b/src/dragonball/dbs_acpi/README.md similarity index 100% rename from src/dragonball/src/dbs_acpi/README.md rename to src/dragonball/dbs_acpi/README.md diff --git a/src/dragonball/src/dbs_acpi/src/lib.rs b/src/dragonball/dbs_acpi/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_acpi/src/lib.rs rename to src/dragonball/dbs_acpi/src/lib.rs diff --git a/src/dragonball/src/dbs_acpi/src/rsdp.rs b/src/dragonball/dbs_acpi/src/rsdp.rs similarity index 100% rename from src/dragonball/src/dbs_acpi/src/rsdp.rs rename to src/dragonball/dbs_acpi/src/rsdp.rs diff --git a/src/dragonball/src/dbs_acpi/src/sdt.rs b/src/dragonball/dbs_acpi/src/sdt.rs similarity index 100% rename from src/dragonball/src/dbs_acpi/src/sdt.rs rename to src/dragonball/dbs_acpi/src/sdt.rs diff --git a/src/dragonball/src/dbs_address_space/Cargo.toml b/src/dragonball/dbs_address_space/Cargo.toml similarity index 84% rename from src/dragonball/src/dbs_address_space/Cargo.toml rename to src/dragonball/dbs_address_space/Cargo.toml index 2ebd84fe6d..8939d1f064 100644 --- a/src/dragonball/src/dbs_address_space/Cargo.toml +++ b/src/dragonball/dbs_address_space/Cargo.toml @@ -16,5 +16,5 @@ libc = "0.2.39" nix = "0.23.1" lazy_static = "1" thiserror = "1" -vmm-sys-util = "0.11.0" -vm-memory = { version = "0.10", features = ["backend-mmap", "backend-atomic"] } +vmm-sys-util = {workspace = true} +vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] } diff --git a/src/dragonball/dbs_address_space/LICENSE b/src/dragonball/dbs_address_space/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_address_space/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_address_space/README.md b/src/dragonball/dbs_address_space/README.md similarity index 100% rename from src/dragonball/src/dbs_address_space/README.md rename to src/dragonball/dbs_address_space/README.md diff --git a/src/dragonball/src/dbs_address_space/src/address_space.rs b/src/dragonball/dbs_address_space/src/address_space.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/address_space.rs rename to src/dragonball/dbs_address_space/src/address_space.rs diff --git a/src/dragonball/src/dbs_address_space/src/layout.rs b/src/dragonball/dbs_address_space/src/layout.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/layout.rs rename to src/dragonball/dbs_address_space/src/layout.rs diff --git a/src/dragonball/src/dbs_address_space/src/lib.rs b/src/dragonball/dbs_address_space/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/lib.rs rename to src/dragonball/dbs_address_space/src/lib.rs diff --git a/src/dragonball/src/dbs_address_space/src/memory/hybrid.rs b/src/dragonball/dbs_address_space/src/memory/hybrid.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/memory/hybrid.rs rename to src/dragonball/dbs_address_space/src/memory/hybrid.rs diff --git a/src/dragonball/src/dbs_address_space/src/memory/mod.rs b/src/dragonball/dbs_address_space/src/memory/mod.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/memory/mod.rs rename to src/dragonball/dbs_address_space/src/memory/mod.rs diff --git a/src/dragonball/src/dbs_address_space/src/memory/raw_region.rs b/src/dragonball/dbs_address_space/src/memory/raw_region.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/memory/raw_region.rs rename to src/dragonball/dbs_address_space/src/memory/raw_region.rs diff --git a/src/dragonball/src/dbs_address_space/src/numa.rs b/src/dragonball/dbs_address_space/src/numa.rs similarity index 100% rename from src/dragonball/src/dbs_address_space/src/numa.rs rename to src/dragonball/dbs_address_space/src/numa.rs diff --git a/src/dragonball/src/dbs_address_space/src/region.rs b/src/dragonball/dbs_address_space/src/region.rs similarity index 99% rename from src/dragonball/src/dbs_address_space/src/region.rs rename to src/dragonball/dbs_address_space/src/region.rs index a0a832404c..b729c12e82 100644 --- a/src/dragonball/src/dbs_address_space/src/region.rs +++ b/src/dragonball/dbs_address_space/src/region.rs @@ -223,6 +223,7 @@ impl AddressSpaceRegion { .read(true) .write(true) .create(true) + .truncate(true) .open(mem_file_path) .map_err(AddressSpaceError::OpenFile)?; nix::unistd::unlink(mem_file_path).map_err(AddressSpaceError::UnlinkFile)?; diff --git a/src/dragonball/src/dbs_allocator/Cargo.toml b/src/dragonball/dbs_allocator/Cargo.toml similarity index 100% rename from src/dragonball/src/dbs_allocator/Cargo.toml rename to src/dragonball/dbs_allocator/Cargo.toml diff --git a/src/dragonball/dbs_allocator/LICENSE b/src/dragonball/dbs_allocator/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_allocator/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_allocator/README.md b/src/dragonball/dbs_allocator/README.md similarity index 100% rename from src/dragonball/src/dbs_allocator/README.md rename to src/dragonball/dbs_allocator/README.md diff --git a/src/dragonball/src/dbs_allocator/src/interval_tree.rs b/src/dragonball/dbs_allocator/src/interval_tree.rs similarity index 99% rename from src/dragonball/src/dbs_allocator/src/interval_tree.rs rename to src/dragonball/dbs_allocator/src/interval_tree.rs index 2ee75c7641..904143c4d4 100644 --- a/src/dragonball/src/dbs_allocator/src/interval_tree.rs +++ b/src/dragonball/dbs_allocator/src/interval_tree.rs @@ -93,7 +93,7 @@ impl Range { { let umin = u64::from(base); let umax = u64::from(size).checked_add(umin).unwrap(); - if umin > umax || (umin == 0 && umax == std::u64::MAX) { + if umin > umax || (umin == 0 && umax == u64::MAX) { panic!("interval_tree: Range({}, {}) is invalid", umin, umax); } Range { @@ -910,7 +910,7 @@ impl IntervalTree { } } } - if range.max < std::u64::MAX { + if range.max < u64::MAX { if let Some((r, v)) = self.get_superset(&Range::new(range.max + 1, range.max + 1)) { if v.is_free() { range.max = r.max; diff --git a/src/dragonball/src/dbs_allocator/src/lib.rs b/src/dragonball/dbs_allocator/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_allocator/src/lib.rs rename to src/dragonball/dbs_allocator/src/lib.rs diff --git a/src/dragonball/src/dbs_arch/Cargo.toml b/src/dragonball/dbs_arch/Cargo.toml similarity index 71% rename from src/dragonball/src/dbs_arch/Cargo.toml rename to src/dragonball/dbs_arch/Cargo.toml index 79b2957fc6..28f4a8b581 100644 --- a/src/dragonball/src/dbs_arch/Cargo.toml +++ b/src/dragonball/dbs_arch/Cargo.toml @@ -12,15 +12,15 @@ readme = "README.md" [dependencies] memoffset = "0.6" -kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] } -kvm-ioctls = "0.12.0" +kvm-bindings = { workspace = true, features = ["fam-wrappers"] } +kvm-ioctls = {workspace = true} thiserror = "1" -vm-memory = { version = "0.10" } -vmm-sys-util = "0.11.0" +vm-memory = { workspace = true } +vmm-sys-util = {workspace = true} libc = ">=0.2.39" [dev-dependencies] -vm-memory = { version = "0.10", features = ["backend-mmap"] } +vm-memory = { workspace = true, features = ["backend-mmap"] } [package.metadata.docs.rs] all-features = true diff --git a/src/dragonball/dbs_arch/LICENSE b/src/dragonball/dbs_arch/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_arch/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_arch/README.md b/src/dragonball/dbs_arch/README.md similarity index 100% rename from src/dragonball/src/dbs_arch/README.md rename to src/dragonball/dbs_arch/README.md diff --git a/src/dragonball/dbs_arch/THIRD-PARTY b/src/dragonball/dbs_arch/THIRD-PARTY new file mode 120000 index 0000000000..da0445cc3f --- /dev/null +++ b/src/dragonball/dbs_arch/THIRD-PARTY @@ -0,0 +1 @@ +../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_arch/docs/x86_64_cpuid.md b/src/dragonball/dbs_arch/docs/x86_64_cpuid.md similarity index 100% rename from src/dragonball/src/dbs_arch/docs/x86_64_cpuid.md rename to src/dragonball/dbs_arch/docs/x86_64_cpuid.md diff --git a/src/dragonball/src/dbs_arch/src/aarch64/gic/gicv2.rs b/src/dragonball/dbs_arch/src/aarch64/gic/gicv2.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/gic/gicv2.rs rename to src/dragonball/dbs_arch/src/aarch64/gic/gicv2.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/gic/gicv3.rs b/src/dragonball/dbs_arch/src/aarch64/gic/gicv3.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/gic/gicv3.rs rename to src/dragonball/dbs_arch/src/aarch64/gic/gicv3.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/gic/its.rs b/src/dragonball/dbs_arch/src/aarch64/gic/its.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/gic/its.rs rename to src/dragonball/dbs_arch/src/aarch64/gic/its.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/gic/mod.rs b/src/dragonball/dbs_arch/src/aarch64/gic/mod.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/gic/mod.rs rename to src/dragonball/dbs_arch/src/aarch64/gic/mod.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/mod.rs b/src/dragonball/dbs_arch/src/aarch64/mod.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/mod.rs rename to src/dragonball/dbs_arch/src/aarch64/mod.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/pmu.rs b/src/dragonball/dbs_arch/src/aarch64/pmu.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/pmu.rs rename to src/dragonball/dbs_arch/src/aarch64/pmu.rs diff --git a/src/dragonball/src/dbs_arch/src/aarch64/regs.rs b/src/dragonball/dbs_arch/src/aarch64/regs.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/aarch64/regs.rs rename to src/dragonball/dbs_arch/src/aarch64/regs.rs diff --git a/src/dragonball/src/dbs_arch/src/lib.rs b/src/dragonball/dbs_arch/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/lib.rs rename to src/dragonball/dbs_arch/src/lib.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/bit_helper.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/bit_helper.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/bit_helper.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/bit_helper.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/brand_string.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/brand_string.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/brand_string.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/brand_string.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/common.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/common.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/common.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/common.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/cpu_leaf.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/cpu_leaf.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/cpu_leaf.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/cpu_leaf.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/mod.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/mod.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/mod.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/mod.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/amd.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/amd.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/amd.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/amd.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/common.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/common.rs similarity index 99% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/common.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/common.rs index 681ef0232b..67d3fe66ca 100644 --- a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/common.rs +++ b/src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/common.rs @@ -119,6 +119,7 @@ pub fn update_extended_topology_entry( /// topology enumeration data. Software must detect the presence of CPUID leaf 1FH by verifying /// - the highest leaf index supported by CPUID is >= 1FH /// - CPUID.1FH:EBX[15:0] reports a non-zero value +/// /// If leaf_0x1f is not implemented in cpu used in host, guest OS should turn to leaf_0xb to /// determine the cpu topology. pub fn update_extended_topology_v2_entry( diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/intel.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/intel.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/intel.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/intel.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/mod.rs b/src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/mod.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/cpuid/transformer/mod.rs rename to src/dragonball/dbs_arch/src/x86_64/cpuid/transformer/mod.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/gdt.rs b/src/dragonball/dbs_arch/src/x86_64/gdt.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/gdt.rs rename to src/dragonball/dbs_arch/src/x86_64/gdt.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/interrupts.rs b/src/dragonball/dbs_arch/src/x86_64/interrupts.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/interrupts.rs rename to src/dragonball/dbs_arch/src/x86_64/interrupts.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/mod.rs b/src/dragonball/dbs_arch/src/x86_64/mod.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/mod.rs rename to src/dragonball/dbs_arch/src/x86_64/mod.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/msr.rs b/src/dragonball/dbs_arch/src/x86_64/msr.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/msr.rs rename to src/dragonball/dbs_arch/src/x86_64/msr.rs diff --git a/src/dragonball/src/dbs_arch/src/x86_64/regs.rs b/src/dragonball/dbs_arch/src/x86_64/regs.rs similarity index 100% rename from src/dragonball/src/dbs_arch/src/x86_64/regs.rs rename to src/dragonball/dbs_arch/src/x86_64/regs.rs diff --git a/src/dragonball/src/dbs_boot/Cargo.toml b/src/dragonball/dbs_boot/Cargo.toml similarity index 72% rename from src/dragonball/src/dbs_boot/Cargo.toml rename to src/dragonball/dbs_boot/Cargo.toml index 1ecac64210..8320e693ba 100644 --- a/src/dragonball/src/dbs_boot/Cargo.toml +++ b/src/dragonball/dbs_boot/Cargo.toml @@ -12,15 +12,15 @@ readme = "README.md" [dependencies] dbs-arch = { path = "../dbs_arch" } -kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] } -kvm-ioctls = "0.12.0" +kvm-bindings = { workspace = true, features = ["fam-wrappers"] } +kvm-ioctls = {workspace = true} lazy_static = "1" libc = "0.2.39" thiserror = "1" -vm-memory = "0.10.0" -vm-fdt = "0.2.0" +vm-memory = {workspace = true} +vm-fdt = {workspace= true} [dev-dependencies] -vm-memory = { version = "0.10.0", features = ["backend-mmap"] } +vm-memory = { workspace = true, features = ["backend-mmap"] } device_tree = ">=1.1.0" dbs-device = { path = "../dbs_device" } diff --git a/src/dragonball/dbs_boot/LICENSE b/src/dragonball/dbs_boot/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_boot/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_boot/README.md b/src/dragonball/dbs_boot/README.md similarity index 100% rename from src/dragonball/src/dbs_boot/README.md rename to src/dragonball/dbs_boot/README.md diff --git a/src/dragonball/dbs_boot/THIRD-PARTY b/src/dragonball/dbs_boot/THIRD-PARTY new file mode 120000 index 0000000000..da0445cc3f --- /dev/null +++ b/src/dragonball/dbs_boot/THIRD-PARTY @@ -0,0 +1 @@ +../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_boot/src/aarch64/fdt.rs b/src/dragonball/dbs_boot/src/aarch64/fdt.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/fdt.rs rename to src/dragonball/dbs_boot/src/aarch64/fdt.rs diff --git a/src/dragonball/src/dbs_boot/src/aarch64/fdt_utils.rs b/src/dragonball/dbs_boot/src/aarch64/fdt_utils.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/fdt_utils.rs rename to src/dragonball/dbs_boot/src/aarch64/fdt_utils.rs diff --git a/src/dragonball/src/dbs_boot/src/aarch64/layout.rs b/src/dragonball/dbs_boot/src/aarch64/layout.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/layout.rs rename to src/dragonball/dbs_boot/src/aarch64/layout.rs diff --git a/src/dragonball/src/dbs_boot/src/aarch64/mod.rs b/src/dragonball/dbs_boot/src/aarch64/mod.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/mod.rs rename to src/dragonball/dbs_boot/src/aarch64/mod.rs diff --git a/src/dragonball/src/dbs_boot/src/aarch64/test/output.dtb b/src/dragonball/dbs_boot/src/aarch64/test/output.dtb similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/test/output.dtb rename to src/dragonball/dbs_boot/src/aarch64/test/output.dtb diff --git a/src/dragonball/src/dbs_boot/src/aarch64/test/output_with_initrd.dtb b/src/dragonball/dbs_boot/src/aarch64/test/output_with_initrd.dtb similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/test/output_with_initrd.dtb rename to src/dragonball/dbs_boot/src/aarch64/test/output_with_initrd.dtb diff --git a/src/dragonball/src/dbs_boot/src/aarch64/test/output_with_pmu.dtb b/src/dragonball/dbs_boot/src/aarch64/test/output_with_pmu.dtb similarity index 100% rename from src/dragonball/src/dbs_boot/src/aarch64/test/output_with_pmu.dtb rename to src/dragonball/dbs_boot/src/aarch64/test/output_with_pmu.dtb diff --git a/src/dragonball/src/dbs_boot/src/lib.rs b/src/dragonball/dbs_boot/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/lib.rs rename to src/dragonball/dbs_boot/src/lib.rs diff --git a/src/dragonball/src/dbs_boot/src/vendor/bootparam.rs b/src/dragonball/dbs_boot/src/vendor/bootparam.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/vendor/bootparam.rs rename to src/dragonball/dbs_boot/src/vendor/bootparam.rs diff --git a/src/dragonball/src/dbs_boot/src/x86_64/bootparam.rs b/src/dragonball/dbs_boot/src/x86_64/bootparam.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/x86_64/bootparam.rs rename to src/dragonball/dbs_boot/src/x86_64/bootparam.rs diff --git a/src/dragonball/src/dbs_boot/src/x86_64/layout.rs b/src/dragonball/dbs_boot/src/x86_64/layout.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/x86_64/layout.rs rename to src/dragonball/dbs_boot/src/x86_64/layout.rs diff --git a/src/dragonball/src/dbs_boot/src/x86_64/mod.rs b/src/dragonball/dbs_boot/src/x86_64/mod.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/x86_64/mod.rs rename to src/dragonball/dbs_boot/src/x86_64/mod.rs diff --git a/src/dragonball/src/dbs_boot/src/x86_64/mpspec.rs b/src/dragonball/dbs_boot/src/x86_64/mpspec.rs similarity index 100% rename from src/dragonball/src/dbs_boot/src/x86_64/mpspec.rs rename to src/dragonball/dbs_boot/src/x86_64/mpspec.rs diff --git a/src/dragonball/src/dbs_boot/src/x86_64/mptable.rs b/src/dragonball/dbs_boot/src/x86_64/mptable.rs similarity index 99% rename from src/dragonball/src/dbs_boot/src/x86_64/mptable.rs rename to src/dragonball/dbs_boot/src/x86_64/mptable.rs index 6541ef293b..dad311519b 100644 --- a/src/dragonball/src/dbs_boot/src/x86_64/mptable.rs +++ b/src/dragonball/dbs_boot/src/x86_64/mptable.rs @@ -133,8 +133,8 @@ const MPC_SPEC: i8 = 4; const MPC_OEM: [c_char; 8] = char_array!(c_char; 'A', 'L', 'I', 'C', 'L', 'O', 'U', 'D'); const MPC_PRODUCT_ID: [c_char; 12] = char_array!(c_char; 'D', 'R', 'A', 'G', 'O', 'N', 'B', 'A', 'L', 'L', '1', '0'); -const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; 'I', 'S', 'A', ' ', ' ', ' '); -const BUS_TYPE_PCI: [u8; 6] = char_array!(u8; 'P', 'C', 'I', ' ', ' ', ' '); +const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; b'I', b'S', b'A', b' ', b' ', b' '); +const BUS_TYPE_PCI: [u8; 6] = char_array!(u8; b'P', b'C', b'I', b' ', b' ', b' '); const IO_APIC_DEFAULT_PHYS_BASE: u32 = 0xfec0_0000; // source: linux/arch/x86/include/asm/apicdef.h const APIC_DEFAULT_PHYS_BASE: u32 = 0xfee0_0000; // source: linux/arch/x86/include/asm/apicdef.h diff --git a/src/dragonball/src/dbs_device/Cargo.toml b/src/dragonball/dbs_device/Cargo.toml similarity index 100% rename from src/dragonball/src/dbs_device/Cargo.toml rename to src/dragonball/dbs_device/Cargo.toml diff --git a/src/dragonball/dbs_device/LICENSE b/src/dragonball/dbs_device/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_device/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_device/README.md b/src/dragonball/dbs_device/README.md similarity index 100% rename from src/dragonball/src/dbs_device/README.md rename to src/dragonball/dbs_device/README.md diff --git a/src/dragonball/src/dbs_device/src/device_manager.rs b/src/dragonball/dbs_device/src/device_manager.rs similarity index 100% rename from src/dragonball/src/dbs_device/src/device_manager.rs rename to src/dragonball/dbs_device/src/device_manager.rs diff --git a/src/dragonball/src/dbs_device/src/lib.rs b/src/dragonball/dbs_device/src/lib.rs similarity index 99% rename from src/dragonball/src/dbs_device/src/lib.rs rename to src/dragonball/dbs_device/src/lib.rs index a482299620..420d343dc1 100644 --- a/src/dragonball/src/dbs_device/src/lib.rs +++ b/src/dragonball/dbs_device/src/lib.rs @@ -107,7 +107,7 @@ impl TryFrom for PioSize { #[inline] fn try_from(size: IoSize) -> Result { - if size.raw_value() <= std::u16::MAX as u64 { + if size.raw_value() <= u16::MAX as u64 { Ok(PioSize(size.raw_value() as PioAddressType)) } else { Err(size) @@ -153,7 +153,7 @@ impl TryFrom for PioAddress { #[inline] fn try_from(addr: IoAddress) -> Result { - if addr.0 <= std::u16::MAX as u64 { + if addr.0 <= u16::MAX as u64 { Ok(PioAddress(addr.raw_value() as PioAddressType)) } else { Err(addr) diff --git a/src/dragonball/src/dbs_device/src/resources.rs b/src/dragonball/dbs_device/src/resources.rs similarity index 100% rename from src/dragonball/src/dbs_device/src/resources.rs rename to src/dragonball/dbs_device/src/resources.rs diff --git a/src/dragonball/src/dbs_interrupt/Cargo.toml b/src/dragonball/dbs_interrupt/Cargo.toml similarity index 85% rename from src/dragonball/src/dbs_interrupt/Cargo.toml rename to src/dragonball/dbs_interrupt/Cargo.toml index 20d5d46e47..2d7c1e8839 100644 --- a/src/dragonball/src/dbs_interrupt/Cargo.toml +++ b/src/dragonball/dbs_interrupt/Cargo.toml @@ -13,10 +13,10 @@ readme = "README.md" [dependencies] dbs-device = { path = "../dbs_device" } dbs-arch = { path = "../dbs_arch" } -kvm-bindings = { version = "0.6.0", optional = true } -kvm-ioctls = { version = "0.12.0", optional = true } +kvm-bindings = { workspace = true, optional = true } +kvm-ioctls = { workspace = true, optional = true } libc = "0.2" -vmm-sys-util = "0.11.0" +vmm-sys-util = {workspace = true} [features] default = ["legacy-irq", "msi-irq"] diff --git a/src/dragonball/dbs_interrupt/LICENSE b/src/dragonball/dbs_interrupt/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_interrupt/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_interrupt/README.md b/src/dragonball/dbs_interrupt/README.md similarity index 100% rename from src/dragonball/src/dbs_interrupt/README.md rename to src/dragonball/dbs_interrupt/README.md diff --git a/src/dragonball/src/dbs_interrupt/src/kvm/legacy_irq.rs b/src/dragonball/dbs_interrupt/src/kvm/legacy_irq.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/kvm/legacy_irq.rs rename to src/dragonball/dbs_interrupt/src/kvm/legacy_irq.rs diff --git a/src/dragonball/src/dbs_interrupt/src/kvm/mod.rs b/src/dragonball/dbs_interrupt/src/kvm/mod.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/kvm/mod.rs rename to src/dragonball/dbs_interrupt/src/kvm/mod.rs diff --git a/src/dragonball/src/dbs_interrupt/src/kvm/msi_generic.rs b/src/dragonball/dbs_interrupt/src/kvm/msi_generic.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/kvm/msi_generic.rs rename to src/dragonball/dbs_interrupt/src/kvm/msi_generic.rs diff --git a/src/dragonball/src/dbs_interrupt/src/kvm/msi_irq.rs b/src/dragonball/dbs_interrupt/src/kvm/msi_irq.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/kvm/msi_irq.rs rename to src/dragonball/dbs_interrupt/src/kvm/msi_irq.rs diff --git a/src/dragonball/src/dbs_interrupt/src/lib.rs b/src/dragonball/dbs_interrupt/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/lib.rs rename to src/dragonball/dbs_interrupt/src/lib.rs diff --git a/src/dragonball/src/dbs_interrupt/src/manager.rs b/src/dragonball/dbs_interrupt/src/manager.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/manager.rs rename to src/dragonball/dbs_interrupt/src/manager.rs diff --git a/src/dragonball/src/dbs_interrupt/src/notifier.rs b/src/dragonball/dbs_interrupt/src/notifier.rs similarity index 100% rename from src/dragonball/src/dbs_interrupt/src/notifier.rs rename to src/dragonball/dbs_interrupt/src/notifier.rs diff --git a/src/dragonball/src/dbs_legacy_devices/Cargo.toml b/src/dragonball/dbs_legacy_devices/Cargo.toml similarity index 90% rename from src/dragonball/src/dbs_legacy_devices/Cargo.toml rename to src/dragonball/dbs_legacy_devices/Cargo.toml index 8655783f7d..b719b63a01 100644 --- a/src/dragonball/src/dbs_legacy_devices/Cargo.toml +++ b/src/dragonball/dbs_legacy_devices/Cargo.toml @@ -16,8 +16,8 @@ dbs-utils = { path = "../dbs_utils" } libc = "0.2.39" log = "0.4.14" serde = { version = "1.0.27", features = ["derive", "rc"] } -vm-superio = "0.5.0" -vmm-sys-util = "0.11.0" +vm-superio = {workspace = true} +vmm-sys-util = {workspace = true} [dev-dependencies] libc = "0.2.39" diff --git a/src/dragonball/dbs_legacy_devices/LICENSE b/src/dragonball/dbs_legacy_devices/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_legacy_devices/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_legacy_devices/README.md b/src/dragonball/dbs_legacy_devices/README.md similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/README.md rename to src/dragonball/dbs_legacy_devices/README.md diff --git a/src/dragonball/dbs_legacy_devices/THIRD-PARTY b/src/dragonball/dbs_legacy_devices/THIRD-PARTY new file mode 120000 index 0000000000..da0445cc3f --- /dev/null +++ b/src/dragonball/dbs_legacy_devices/THIRD-PARTY @@ -0,0 +1 @@ +../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_legacy_devices/src/cmos.rs b/src/dragonball/dbs_legacy_devices/src/cmos.rs similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/src/cmos.rs rename to src/dragonball/dbs_legacy_devices/src/cmos.rs diff --git a/src/dragonball/src/dbs_legacy_devices/src/i8042.rs b/src/dragonball/dbs_legacy_devices/src/i8042.rs similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/src/i8042.rs rename to src/dragonball/dbs_legacy_devices/src/i8042.rs diff --git a/src/dragonball/src/dbs_legacy_devices/src/lib.rs b/src/dragonball/dbs_legacy_devices/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/src/lib.rs rename to src/dragonball/dbs_legacy_devices/src/lib.rs diff --git a/src/dragonball/src/dbs_legacy_devices/src/rtc_pl031.rs b/src/dragonball/dbs_legacy_devices/src/rtc_pl031.rs similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/src/rtc_pl031.rs rename to src/dragonball/dbs_legacy_devices/src/rtc_pl031.rs diff --git a/src/dragonball/src/dbs_legacy_devices/src/serial.rs b/src/dragonball/dbs_legacy_devices/src/serial.rs similarity index 100% rename from src/dragonball/src/dbs_legacy_devices/src/serial.rs rename to src/dragonball/dbs_legacy_devices/src/serial.rs diff --git a/src/dragonball/src/dbs_pci/Cargo.lock b/src/dragonball/dbs_pci/Cargo.lock similarity index 100% rename from src/dragonball/src/dbs_pci/Cargo.lock rename to src/dragonball/dbs_pci/Cargo.lock diff --git a/src/dragonball/src/dbs_pci/Cargo.toml b/src/dragonball/dbs_pci/Cargo.toml similarity index 82% rename from src/dragonball/src/dbs_pci/Cargo.toml rename to src/dragonball/dbs_pci/Cargo.toml index 70aa2a0be1..26aa2aad52 100644 --- a/src/dragonball/src/dbs_pci/Cargo.toml +++ b/src/dragonball/dbs_pci/Cargo.toml @@ -23,16 +23,16 @@ dbs-interrupt = { path = "../dbs_interrupt", features = [ ] } downcast-rs = "1.2.0" byteorder = "1.4.3" -vm-memory = "0.10.0" -kvm-ioctls = "0.12.0" -kvm-bindings = "0.6.0" -vfio-ioctls = "0.1.0" -vfio-bindings = "0.3.0" +vm-memory = {workspace = true} +kvm-ioctls = {workspace = true} +kvm-bindings = {workspace = true} +vfio-ioctls = {workspace = true} +vfio-bindings = {workspace = true} libc = "0.2.39" [dev-dependencies] dbs-arch = { path = "../dbs_arch" } -kvm-ioctls = "0.12.0" +kvm-ioctls = {workspace = true} [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/src/dragonball/src/dbs_pci/README.md b/src/dragonball/dbs_pci/README.md similarity index 79% rename from src/dragonball/src/dbs_pci/README.md rename to src/dragonball/dbs_pci/README.md index 7012514aa2..d9ac8212d3 100644 --- a/src/dragonball/src/dbs_pci/README.md +++ b/src/dragonball/dbs_pci/README.md @@ -4,11 +4,11 @@ `dbs-pci` is a crate for emulating PCI device. -There are several components in `dbs-pci` crate building together to emulate PCI device behaviour : +There are several components in `dbs-pci` crate building together to emulate PCI device behavior : 1. device mod: mainly provide the trait for `PciDevice`, providing the ability to get id, write PCI configuration space, read PCI configuration space and `as_any` to downcast the trait object to the actual device type. -2. configuration mod: simulate PCI device configuration header and manage PCI Bar configuration. The PCI Specification defines the organization of the 256-byte Configuration Space registers and imposes a specific template for the space. The first 64 bytes of configuration space are standardised as configuration space header. +2. configuration mod: simulate PCI device configuration header and manage PCI Bar configuration. The PCI Specification defines the organization of the 256-byte Configuration Space registers and imposes a specific template for the space. The first 64 bytes of configuration space are standardized as configuration space header. 3. bus mod: simulate PCI buses, to simplify the implementation, PCI hierarchy is not supported. So all PCI devices are directly connected to the PCI root bus. PCI Bus has bus id, PCI devices attached and PCI bus I/O port, I/O mem resource use condition. @@ -16,9 +16,9 @@ There are several components in `dbs-pci` crate building together to emulate PCI 5. root device mod: a pseudo PCI root device to manage accessing to PCI configuration space. -6. `msi` mod: struct to maintain information for PCI Message Signalled Interrupt Capability. It will be initialized when parsing PCI configuration space and used when getting interrupt capabilities. +6. `msi` mod: struct to maintain information for PCI Message Signaled Interrupt Capability. It will be initialized when parsing PCI configuration space and used when getting interrupt capabilities. -7. `msix` mod: struct to maintain information for PCI Message Signalled Interrupt Extended Capability. It will be initialized when parsing PCI configuration space and used when getting interrupt capabilities. +7. `msix` mod: struct to maintain information for PCI Message Signaled Interrupt Extended Capability. It will be initialized when parsing PCI configuration space and used when getting interrupt capabilities. 8. `vfio` mod: `vfio` mod collects lots of information related to the `vfio` operations. a. `vfio` `msi` and `msix` capability and state diff --git a/src/dragonball/src/dbs_pci/src/bus.rs b/src/dragonball/dbs_pci/src/bus.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/bus.rs rename to src/dragonball/dbs_pci/src/bus.rs diff --git a/src/dragonball/src/dbs_pci/src/configuration.rs b/src/dragonball/dbs_pci/src/configuration.rs similarity index 99% rename from src/dragonball/src/dbs_pci/src/configuration.rs rename to src/dragonball/dbs_pci/src/configuration.rs index da1cee39a9..08c1c17c45 100644 --- a/src/dragonball/src/dbs_pci/src/configuration.rs +++ b/src/dragonball/dbs_pci/src/configuration.rs @@ -1000,18 +1000,18 @@ impl PciConfiguration { .ok_or(Error::BarAddressInvalid(config.addr, config.size))?; match config.bar_type { PciBarRegionType::IoRegion => { - if config.size < 0x4 || config.size > u64::from(u32::max_value()) { + if config.size < 0x4 || config.size > u64::from(u32::MAX) { return Err(Error::BarSizeInvalid(config.size)); } - if end_addr > u64::from(u32::max_value()) { + if end_addr > u64::from(u32::MAX) { return Err(Error::BarAddressInvalid(config.addr, config.size)); } } PciBarRegionType::Memory32BitRegion => { - if config.size < 0x10 || config.size > u64::from(u32::max_value()) { + if config.size < 0x10 || config.size > u64::from(u32::MAX) { return Err(Error::BarSizeInvalid(config.size)); } - if end_addr > u64::from(u32::max_value()) { + if end_addr > u64::from(u32::MAX) { return Err(Error::BarAddressInvalid(config.addr, config.size)); } } @@ -1022,9 +1022,6 @@ impl PciConfiguration { if self.bar_used(config.bar_idx + 1) { return Err(Error::BarInUse64(config.bar_idx)); } - if end_addr > u64::max_value() { - return Err(Error::BarAddressInvalid(config.addr, config.size)); - } self.registers[reg_idx + 1] = (config.addr >> 32) as u32; self.writable_bits[reg_idx + 1] = 0xffff_ffff; @@ -1085,7 +1082,7 @@ impl PciConfiguration { .bitand(!(u64::from(!ROM_BAR_ADDR_MASK))) .checked_add(config.size - 1) .ok_or(Error::RomBarAddressInvalid(config.addr, config.size))?; - if end_addr > u64::from(u32::max_value()) { + if end_addr > u64::from(u32::MAX) { return Err(Error::RomBarAddressInvalid(config.addr, config.size)); } diff --git a/src/dragonball/src/dbs_pci/src/device.rs b/src/dragonball/dbs_pci/src/device.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/device.rs rename to src/dragonball/dbs_pci/src/device.rs diff --git a/src/dragonball/src/dbs_pci/src/lib.rs b/src/dragonball/dbs_pci/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/lib.rs rename to src/dragonball/dbs_pci/src/lib.rs diff --git a/src/dragonball/src/dbs_pci/src/msi.rs b/src/dragonball/dbs_pci/src/msi.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/msi.rs rename to src/dragonball/dbs_pci/src/msi.rs diff --git a/src/dragonball/src/dbs_pci/src/msix.rs b/src/dragonball/dbs_pci/src/msix.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/msix.rs rename to src/dragonball/dbs_pci/src/msix.rs diff --git a/src/dragonball/src/dbs_pci/src/root_bus.rs b/src/dragonball/dbs_pci/src/root_bus.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/root_bus.rs rename to src/dragonball/dbs_pci/src/root_bus.rs diff --git a/src/dragonball/src/dbs_pci/src/root_device.rs b/src/dragonball/dbs_pci/src/root_device.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/root_device.rs rename to src/dragonball/dbs_pci/src/root_device.rs diff --git a/src/dragonball/src/dbs_pci/src/vfio.rs b/src/dragonball/dbs_pci/src/vfio.rs similarity index 100% rename from src/dragonball/src/dbs_pci/src/vfio.rs rename to src/dragonball/dbs_pci/src/vfio.rs diff --git a/src/dragonball/src/dbs_tdx/Cargo.toml b/src/dragonball/dbs_tdx/Cargo.toml similarity index 83% rename from src/dragonball/src/dbs_tdx/Cargo.toml rename to src/dragonball/dbs_tdx/Cargo.toml index 2643c6e485..a94fe42f9d 100644 --- a/src/dragonball/src/dbs_tdx/Cargo.toml +++ b/src/dragonball/dbs_tdx/Cargo.toml @@ -12,8 +12,8 @@ readme = "README.md" [dependencies] thiserror = "1.0" -kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] } -vmm-sys-util = "0.11.0" +kvm-bindings = { workspace = true, features = ["fam-wrappers"] } +vmm-sys-util = {workspace = true} [dev-dependencies] serde_json = "1.0.9" diff --git a/src/dragonball/src/dbs_tdx/README.md b/src/dragonball/dbs_tdx/README.md similarity index 100% rename from src/dragonball/src/dbs_tdx/README.md rename to src/dragonball/dbs_tdx/README.md diff --git a/src/dragonball/src/dbs_tdx/src/lib.rs b/src/dragonball/dbs_tdx/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_tdx/src/lib.rs rename to src/dragonball/dbs_tdx/src/lib.rs diff --git a/src/dragonball/src/dbs_tdx/src/tdx_ioctls.rs b/src/dragonball/dbs_tdx/src/tdx_ioctls.rs similarity index 100% rename from src/dragonball/src/dbs_tdx/src/tdx_ioctls.rs rename to src/dragonball/dbs_tdx/src/tdx_ioctls.rs diff --git a/src/dragonball/src/dbs_upcall/Cargo.toml b/src/dragonball/dbs_upcall/Cargo.toml similarity index 100% rename from src/dragonball/src/dbs_upcall/Cargo.toml rename to src/dragonball/dbs_upcall/Cargo.toml diff --git a/src/dragonball/dbs_upcall/LICENSE b/src/dragonball/dbs_upcall/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_upcall/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_upcall/README.md b/src/dragonball/dbs_upcall/README.md similarity index 100% rename from src/dragonball/src/dbs_upcall/README.md rename to src/dragonball/dbs_upcall/README.md diff --git a/src/dragonball/src/dbs_upcall/images/upcall_state_machine.png b/src/dragonball/dbs_upcall/images/upcall_state_machine.png similarity index 100% rename from src/dragonball/src/dbs_upcall/images/upcall_state_machine.png rename to src/dragonball/dbs_upcall/images/upcall_state_machine.png diff --git a/src/dragonball/src/dbs_upcall/src/dev_mgr_service.rs b/src/dragonball/dbs_upcall/src/dev_mgr_service.rs similarity index 100% rename from src/dragonball/src/dbs_upcall/src/dev_mgr_service.rs rename to src/dragonball/dbs_upcall/src/dev_mgr_service.rs diff --git a/src/dragonball/src/dbs_upcall/src/lib.rs b/src/dragonball/dbs_upcall/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_upcall/src/lib.rs rename to src/dragonball/dbs_upcall/src/lib.rs diff --git a/src/dragonball/src/dbs_utils/Cargo.lock b/src/dragonball/dbs_utils/Cargo.lock similarity index 100% rename from src/dragonball/src/dbs_utils/Cargo.lock rename to src/dragonball/dbs_utils/Cargo.lock diff --git a/src/dragonball/src/dbs_utils/Cargo.toml b/src/dragonball/dbs_utils/Cargo.toml similarity index 85% rename from src/dragonball/src/dbs_utils/Cargo.toml rename to src/dragonball/dbs_utils/Cargo.toml index ae2267ffc2..aa8a7da62d 100644 --- a/src/dragonball/src/dbs_utils/Cargo.toml +++ b/src/dragonball/dbs_utils/Cargo.toml @@ -12,13 +12,13 @@ readme = "README.md" [dependencies] anyhow = "1.0" -event-manager = { version = "0.2.1", features = [ "remote_endpoint" ] } +event-manager = { workspace = true, features = [ "remote_endpoint" ] } libc = "0.2.39" log = "0.4.14" serde = { version = "1.0.27", features = ["derive", "rc"] } thiserror = "1.0" timerfd = "1.0" -vmm-sys-util = "0.11.0" +vmm-sys-util = {workspace = true} [dev-dependencies] serde_json = "1.0.9" diff --git a/src/dragonball/dbs_utils/LICENSE b/src/dragonball/dbs_utils/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_utils/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_utils/README.md b/src/dragonball/dbs_utils/README.md similarity index 100% rename from src/dragonball/src/dbs_utils/README.md rename to src/dragonball/dbs_utils/README.md diff --git a/src/dragonball/dbs_utils/THIRD-PARTY b/src/dragonball/dbs_utils/THIRD-PARTY new file mode 120000 index 0000000000..da0445cc3f --- /dev/null +++ b/src/dragonball/dbs_utils/THIRD-PARTY @@ -0,0 +1 @@ +../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_utils/src/epoll_manager.rs b/src/dragonball/dbs_utils/src/epoll_manager.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/epoll_manager.rs rename to src/dragonball/dbs_utils/src/epoll_manager.rs diff --git a/src/dragonball/src/dbs_utils/src/lib.rs b/src/dragonball/dbs_utils/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/lib.rs rename to src/dragonball/dbs_utils/src/lib.rs diff --git a/src/dragonball/src/dbs_utils/src/metric.rs b/src/dragonball/dbs_utils/src/metric.rs similarity index 97% rename from src/dragonball/src/dbs_utils/src/metric.rs rename to src/dragonball/dbs_utils/src/metric.rs index cfef025f07..aba2fea3cb 100644 --- a/src/dragonball/src/dbs_utils/src/metric.rs +++ b/src/dragonball/dbs_utils/src/metric.rs @@ -16,9 +16,9 @@ //! //! The system implements 2 types of metrics: //! * Shared Incremental Metrics (SharedIncMetrics) - dedicated for the metrics which need a counter -//! (i.e the number of times an API request failed). These metrics are reset upon flush. +//! (i.e the number of times an API request failed). These metrics are reset upon flush. //! * Shared Store Metrics (SharedStoreMetrics) - are targeted at keeping a persistent value, it is not -//! intended to act as a counter (i.e for measure the process start up time for example). +//! intended to act as a counter (i.e for measure the process start up time for example). //! //! The current approach for the `SharedIncMetrics` type is to store two values (current and previous) //! and compute the delta between them each time we do a flush (i.e by serialization). There are a number of advantages @@ -27,6 +27,7 @@ //! does to actual writing, so less synchronization effort is required. //! * We don't have to worry at all that much about losing some data if writing fails for a while //! (this could be a concern, I guess). +//! //! If if turns out this approach is not really what we want, it's pretty easy to resort to //! something else, while working behind the same interface. diff --git a/src/dragonball/src/dbs_utils/src/net/mac.rs b/src/dragonball/dbs_utils/src/net/mac.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/mac.rs rename to src/dragonball/dbs_utils/src/net/mac.rs diff --git a/src/dragonball/src/dbs_utils/src/net/mod.rs b/src/dragonball/dbs_utils/src/net/mod.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/mod.rs rename to src/dragonball/dbs_utils/src/net/mod.rs diff --git a/src/dragonball/src/dbs_utils/src/net/net_gen/if_tun.rs b/src/dragonball/dbs_utils/src/net/net_gen/if_tun.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/net_gen/if_tun.rs rename to src/dragonball/dbs_utils/src/net/net_gen/if_tun.rs diff --git a/src/dragonball/src/dbs_utils/src/net/net_gen/iff.rs b/src/dragonball/dbs_utils/src/net/net_gen/iff.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/net_gen/iff.rs rename to src/dragonball/dbs_utils/src/net/net_gen/iff.rs diff --git a/src/dragonball/src/dbs_utils/src/net/net_gen/inn.rs b/src/dragonball/dbs_utils/src/net/net_gen/inn.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/net_gen/inn.rs rename to src/dragonball/dbs_utils/src/net/net_gen/inn.rs diff --git a/src/dragonball/src/dbs_utils/src/net/net_gen/mod.rs b/src/dragonball/dbs_utils/src/net/net_gen/mod.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/net_gen/mod.rs rename to src/dragonball/dbs_utils/src/net/net_gen/mod.rs diff --git a/src/dragonball/src/dbs_utils/src/net/net_gen/sockios.rs b/src/dragonball/dbs_utils/src/net/net_gen/sockios.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/net/net_gen/sockios.rs rename to src/dragonball/dbs_utils/src/net/net_gen/sockios.rs diff --git a/src/dragonball/src/dbs_utils/src/net/tap.rs b/src/dragonball/dbs_utils/src/net/tap.rs similarity index 99% rename from src/dragonball/src/dbs_utils/src/net/tap.rs rename to src/dragonball/dbs_utils/src/net/tap.rs index 7234a59c3a..9086cfb289 100644 --- a/src/dragonball/src/dbs_utils/src/net/tap.rs +++ b/src/dragonball/dbs_utils/src/net/tap.rs @@ -306,7 +306,9 @@ mod tests { let addr_in = net_gen::sockaddr_in { sin_family: net_gen::AF_INET as u16, sin_port: 0, - sin_addr: unsafe { mem::transmute(ip_addr.octets()) }, + sin_addr: unsafe { + mem::transmute::<[u8; 4], crate::net::net_gen::inn::in_addr>(ip_addr.octets()) + }, __pad: [0; 8usize], }; diff --git a/src/dragonball/src/dbs_utils/src/rate_limiter.rs b/src/dragonball/dbs_utils/src/rate_limiter.rs similarity index 99% rename from src/dragonball/src/dbs_utils/src/rate_limiter.rs rename to src/dragonball/dbs_utils/src/rate_limiter.rs index e99e2336cb..02d2264f64 100644 --- a/src/dragonball/src/dbs_utils/src/rate_limiter.rs +++ b/src/dragonball/dbs_utils/src/rate_limiter.rs @@ -337,14 +337,14 @@ impl RateLimiter { /// /// * `bytes_total_capacity` - the total capacity of the `TokenType::Bytes` token bucket. /// * `bytes_one_time_burst` - initial extra credit on top of `bytes_total_capacity`, - /// that does not replenish and which can be used for an initial burst of data. + /// that does not replenish and which can be used for an initial burst of data. /// * `bytes_complete_refill_time_ms` - number of milliseconds for the `TokenType::Bytes` - /// token bucket to go from zero Bytes to `bytes_total_capacity` Bytes. + /// token bucket to go from zero Bytes to `bytes_total_capacity` Bytes. /// * `ops_total_capacity` - the total capacity of the `TokenType::Ops` token bucket. /// * `ops_one_time_burst` - initial extra credit on top of `ops_total_capacity`, - /// that does not replenish and which can be used for an initial burst of data. + /// that does not replenish and which can be used for an initial burst of data. /// * `ops_complete_refill_time_ms` - number of milliseconds for the `TokenType::Ops` token - /// bucket to go from zero Ops to `ops_total_capacity` Ops. + /// bucket to go from zero Ops to `ops_total_capacity` Ops. /// /// If either bytes/ops *size* or *refill_time* are **zero**, the limiter /// is **disabled** for that respective token type. diff --git a/src/dragonball/src/dbs_utils/src/time.rs b/src/dragonball/dbs_utils/src/time.rs similarity index 100% rename from src/dragonball/src/dbs_utils/src/time.rs rename to src/dragonball/dbs_utils/src/time.rs diff --git a/src/dragonball/src/dbs_virtio_devices/Cargo.lock b/src/dragonball/dbs_virtio_devices/Cargo.lock similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/Cargo.lock rename to src/dragonball/dbs_virtio_devices/Cargo.lock diff --git a/src/dragonball/src/dbs_virtio_devices/Cargo.toml b/src/dragonball/dbs_virtio_devices/Cargo.toml similarity index 87% rename from src/dragonball/src/dbs_virtio_devices/Cargo.toml rename to src/dragonball/dbs_virtio_devices/Cargo.toml index 5f53804463..c30af0960b 100644 --- a/src/dragonball/src/dbs_virtio_devices/Cargo.toml +++ b/src/dragonball/dbs_virtio_devices/Cargo.toml @@ -24,8 +24,8 @@ dbs-boot = { path = "../dbs_boot" } epoll = ">=4.3.1, <4.3.2" io-uring = "0.5.2" fuse-backend-rs = { version = "0.10.5", optional = true } -kvm-bindings = "0.6.0" -kvm-ioctls = "0.12.0" +kvm-bindings = { workspace = true} +kvm-ioctls = {workspace = true} libc = "0.2.119" log = "0.4.14" nix = "0.24.3" @@ -37,16 +37,16 @@ serde = "1.0.27" serde_json = "1.0.9" thiserror = "1" threadpool = "1" -virtio-bindings = "0.1.0" -virtio-queue = "0.7.0" -vmm-sys-util = "0.11.0" -vm-memory = { version = "0.10.0", features = ["backend-mmap"] } +virtio-bindings = {workspace = true} +virtio-queue = {workspace = true} +vmm-sys-util = {workspace = true} +vm-memory = { workspace = true, features = ["backend-mmap"] } sendfd = "0.4.3" vhost-rs = { version = "0.6.1", package = "vhost", optional = true } timerfd = "1.0" [dev-dependencies] -vm-memory = { version = "0.10.0", features = [ +vm-memory = { workspace = true, features = [ "backend-mmap", "backend-atomic", ] } diff --git a/src/dragonball/dbs_virtio_devices/LICENSE b/src/dragonball/dbs_virtio_devices/LICENSE new file mode 120000 index 0000000000..ea5b60640b --- /dev/null +++ b/src/dragonball/dbs_virtio_devices/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_virtio_devices/README.md b/src/dragonball/dbs_virtio_devices/README.md similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/README.md rename to src/dragonball/dbs_virtio_devices/README.md diff --git a/src/dragonball/dbs_virtio_devices/THIRD-PARTY b/src/dragonball/dbs_virtio_devices/THIRD-PARTY new file mode 120000 index 0000000000..da0445cc3f --- /dev/null +++ b/src/dragonball/dbs_virtio_devices/THIRD-PARTY @@ -0,0 +1 @@ +../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_virtio_devices/src/balloon.rs b/src/dragonball/dbs_virtio_devices/src/balloon.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/balloon.rs rename to src/dragonball/dbs_virtio_devices/src/balloon.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/device.rs b/src/dragonball/dbs_virtio_devices/src/block/device.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/device.rs rename to src/dragonball/dbs_virtio_devices/src/block/device.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/handler.rs b/src/dragonball/dbs_virtio_devices/src/block/handler.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/handler.rs rename to src/dragonball/dbs_virtio_devices/src/block/handler.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/mod.rs b/src/dragonball/dbs_virtio_devices/src/block/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/mod.rs rename to src/dragonball/dbs_virtio_devices/src/block/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/request.rs b/src/dragonball/dbs_virtio_devices/src/block/request.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/request.rs rename to src/dragonball/dbs_virtio_devices/src/block/request.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/ufile/aio.rs b/src/dragonball/dbs_virtio_devices/src/block/ufile/aio.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/ufile/aio.rs rename to src/dragonball/dbs_virtio_devices/src/block/ufile/aio.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/ufile/io_uring.rs b/src/dragonball/dbs_virtio_devices/src/block/ufile/io_uring.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/ufile/io_uring.rs rename to src/dragonball/dbs_virtio_devices/src/block/ufile/io_uring.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/ufile/localfile.rs b/src/dragonball/dbs_virtio_devices/src/block/ufile/localfile.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/ufile/localfile.rs rename to src/dragonball/dbs_virtio_devices/src/block/ufile/localfile.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/block/ufile/mod.rs b/src/dragonball/dbs_virtio_devices/src/block/ufile/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/block/ufile/mod.rs rename to src/dragonball/dbs_virtio_devices/src/block/ufile/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/device.rs b/src/dragonball/dbs_virtio_devices/src/device.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/device.rs rename to src/dragonball/dbs_virtio_devices/src/device.rs index 95c80cbb34..79aa70b5bb 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/device.rs +++ b/src/dragonball/dbs_virtio_devices/src/device.rs @@ -340,9 +340,11 @@ pub trait VirtioRegionHandler: Send { /// - query device's resource requirement and allocate resources for it. /// - handle guest register access by forwarding requests to the device. /// - call activate()/reset() when the device is activated/reset by the guest. +/// /// The lifecycle of a virtio device is to be moved to a virtio transport, which will then query the /// device. Once the guest driver has configured the device, `VirtioDevice::activate` will be called /// and all the events, memory, and queues for device operation will be moved into the device. +/// /// Optionally, a virtio device can implement device reset in which it returns said resources and /// resets its internal. pub trait VirtioDevice: Send { diff --git a/src/dragonball/src/dbs_virtio_devices/src/epoll_helper.rs b/src/dragonball/dbs_virtio_devices/src/epoll_helper.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/epoll_helper.rs rename to src/dragonball/dbs_virtio_devices/src/epoll_helper.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/fs/device.rs b/src/dragonball/dbs_virtio_devices/src/fs/device.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/fs/device.rs rename to src/dragonball/dbs_virtio_devices/src/fs/device.rs index a2b562b0e2..4e7dafe1fb 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/fs/device.rs +++ b/src/dragonball/dbs_virtio_devices/src/fs/device.rs @@ -883,7 +883,7 @@ where // Request for DAX window. The memory needs to be 2MiB aligned in order to support // hugepages, and needs to be above 4G to avoid confliction with lapic/ioapic devices. requests.push(ResourceConstraint::MmioAddress { - range: Some((0x1_0000_0000, std::u64::MAX)), + range: Some((0x1_0000_0000, u64::MAX)), align: 0x0020_0000, size: self.cache_size, }); diff --git a/src/dragonball/src/dbs_virtio_devices/src/fs/handler.rs b/src/dragonball/dbs_virtio_devices/src/fs/handler.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/fs/handler.rs rename to src/dragonball/dbs_virtio_devices/src/fs/handler.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/fs/mod.rs b/src/dragonball/dbs_virtio_devices/src/fs/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/fs/mod.rs rename to src/dragonball/dbs_virtio_devices/src/fs/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/lib.rs b/src/dragonball/dbs_virtio_devices/src/lib.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/lib.rs rename to src/dragonball/dbs_virtio_devices/src/lib.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/mem.rs b/src/dragonball/dbs_virtio_devices/src/mem.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/mem.rs rename to src/dragonball/dbs_virtio_devices/src/mem.rs index bc228a405b..01b8a7e687 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/mem.rs +++ b/src/dragonball/dbs_virtio_devices/src/mem.rs @@ -56,7 +56,7 @@ pub const VIRTIO_MEM_DEFAULT_BLOCK_ALIGNMENT: u64 = 128 * 1024 * 1024; const VIRTIO_MEM_MAP_REGION_SHIFT: u64 = 31; const VIRTIO_MEM_MAP_REGION_SIZE: u64 = 1 << VIRTIO_MEM_MAP_REGION_SHIFT; -const VIRTIO_MEM_MAP_REGION_MASK: u64 = !(std::u64::MAX << VIRTIO_MEM_MAP_REGION_SHIFT); +const VIRTIO_MEM_MAP_REGION_MASK: u64 = !(u64::MAX << VIRTIO_MEM_MAP_REGION_SHIFT); /// Max memory block size used in guest kernel. const MAX_MEMORY_BLOCK_SIZE: u64 = 2 << 30; diff --git a/src/dragonball/src/dbs_virtio_devices/src/mmio/dragonball.rs b/src/dragonball/dbs_virtio_devices/src/mmio/dragonball.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/mmio/dragonball.rs rename to src/dragonball/dbs_virtio_devices/src/mmio/dragonball.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/mmio/mmio_state.rs b/src/dragonball/dbs_virtio_devices/src/mmio/mmio_state.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/mmio/mmio_state.rs rename to src/dragonball/dbs_virtio_devices/src/mmio/mmio_state.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/mmio/mmio_v2.rs b/src/dragonball/dbs_virtio_devices/src/mmio/mmio_v2.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/mmio/mmio_v2.rs rename to src/dragonball/dbs_virtio_devices/src/mmio/mmio_v2.rs index 23fa7ee93d..dd3d0604b8 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/mmio/mmio_v2.rs +++ b/src/dragonball/dbs_virtio_devices/src/mmio/mmio_v2.rs @@ -34,10 +34,10 @@ const DEVICE_STATUS_DRIVER_OK: u32 = DEVICE_STATUS_FEATURE_OK | DEVICE_DRIVER_OK /// This requires 3 points of installation to work with a VM: /// /// 1. Mmio reads and writes must be sent to this device at what is referred to here as MMIO base. -/// 1. `Mmio::queue_evts` must be installed at `MMIO_NOTIFY_REG_OFFSET` offset from the MMIO -/// base. Each event in the array must be signaled if the index is written at that offset. -/// 1. `Mmio::interrupt_evt` must signal an interrupt that the guest driver is listening to when it -/// is written to. +/// 2. `Mmio::queue_evts` must be installed at `MMIO_NOTIFY_REG_OFFSET` offset from the MMIO +/// base. Each event in the array must be signaled if the index is written at that offset. +/// 3. `Mmio::interrupt_evt` must signal an interrupt that the guest driver is listening to when it +/// is written to. /// /// Typically one page (4096 bytes) of MMIO address space is sufficient to handle this transport /// and inner virtio device. diff --git a/src/dragonball/src/dbs_virtio_devices/src/mmio/mod.rs b/src/dragonball/dbs_virtio_devices/src/mmio/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/mmio/mod.rs rename to src/dragonball/dbs_virtio_devices/src/mmio/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/net.rs b/src/dragonball/dbs_virtio_devices/src/net.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/net.rs rename to src/dragonball/dbs_virtio_devices/src/net.rs index 45af943a2a..5fe3f03dec 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/net.rs +++ b/src/dragonball/dbs_virtio_devices/src/net.rs @@ -238,7 +238,7 @@ impl NetEpollH // `frame_buf` should contain the frame bytes in a slice of exact length. // Returns whether MMDS consumed the frame. fn write_to_tap(frame_buf: &[u8], tap: &mut Tap, metrics: &Arc) { - match tap.write(frame_buf) { + match tap.write_all(frame_buf) { Ok(_) => { metrics.tx_bytes_count.add(frame_buf.len()); metrics.tx_packets_count.inc(); diff --git a/src/dragonball/src/dbs_virtio_devices/src/net_common.rs b/src/dragonball/dbs_virtio_devices/src/net_common.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/net_common.rs rename to src/dragonball/dbs_virtio_devices/src/net_common.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/notifier.rs b/src/dragonball/dbs_virtio_devices/src/notifier.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/notifier.rs rename to src/dragonball/dbs_virtio_devices/src/notifier.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/mod.rs b/src/dragonball/dbs_virtio_devices/src/vhost/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/net.rs b/src/dragonball/dbs_virtio_devices/src/vhost/net.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/net.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/net.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/mod.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/net.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/net.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/net.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/net.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/test_utils.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/test_utils.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/test_utils.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/test_utils.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/block.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/block.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs index 0c52a23abb..1ac00b2da7 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/block.rs +++ b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs @@ -360,7 +360,7 @@ impl VhostUserBlockDevice { if !Path::new(self.vhost_socket.as_str()).exists() { return Err(ActivateError::InternalError); } - let master = Master::connect(&String::from(self.vhost_socket.as_str()), 1) + let master = Master::connect(String::from(self.vhost_socket.as_str()), 1) .map_err(VirtIoError::VhostError)?; self.endpoint.set_master(master); diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/connection.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/connection.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/fs.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/fs.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/fs.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/fs.rs index 0739396d05..042aa410d6 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/fs.rs +++ b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/fs.rs @@ -669,7 +669,7 @@ where // Request for DAX window. The memory needs to be 2MiB aligned in order to support // huge pages, and needs to be above 4G to avoid conflicts with lapic/ioapic devices. requests.push(ResourceConstraint::MmioAddress { - range: Some((0x1_0000_0000, std::u64::MAX)), + range: Some((0x1_0000_0000, u64::MAX)), align: 0x0020_0000, size: device.cache_size, }); diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/mod.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/net.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/net.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/net.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/net.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/test_utils.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/test_utils.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/test_utils.rs rename to src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/test_utils.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/backend/hybrid_stream.rs b/src/dragonball/dbs_virtio_devices/src/vsock/backend/hybrid_stream.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/backend/hybrid_stream.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/backend/hybrid_stream.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/backend/inner.rs b/src/dragonball/dbs_virtio_devices/src/vsock/backend/inner.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/backend/inner.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/backend/inner.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/backend/mod.rs b/src/dragonball/dbs_virtio_devices/src/vsock/backend/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/backend/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/backend/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/backend/tcp.rs b/src/dragonball/dbs_virtio_devices/src/vsock/backend/tcp.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/backend/tcp.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/backend/tcp.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/backend/unix_stream.rs b/src/dragonball/dbs_virtio_devices/src/vsock/backend/unix_stream.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/backend/unix_stream.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/backend/unix_stream.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/csm/connection.rs b/src/dragonball/dbs_virtio_devices/src/vsock/csm/connection.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/csm/connection.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/csm/connection.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/csm/mod.rs b/src/dragonball/dbs_virtio_devices/src/vsock/csm/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/csm/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/csm/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/csm/txbuf.rs b/src/dragonball/dbs_virtio_devices/src/vsock/csm/txbuf.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/csm/txbuf.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/csm/txbuf.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/device.rs b/src/dragonball/dbs_virtio_devices/src/vsock/device.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/device.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/device.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/epoll_handler.rs b/src/dragonball/dbs_virtio_devices/src/vsock/epoll_handler.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/epoll_handler.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/epoll_handler.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/mod.rs b/src/dragonball/dbs_virtio_devices/src/vsock/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/mod.rs b/src/dragonball/dbs_virtio_devices/src/vsock/muxer/mod.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/mod.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/muxer/mod.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_impl.rs b/src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_impl.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_impl.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_impl.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_killq.rs b/src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_killq.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_killq.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_killq.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_rxq.rs b/src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_rxq.rs similarity index 100% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/muxer/muxer_rxq.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/muxer/muxer_rxq.rs diff --git a/src/dragonball/src/dbs_virtio_devices/src/vsock/packet.rs b/src/dragonball/dbs_virtio_devices/src/vsock/packet.rs similarity index 99% rename from src/dragonball/src/dbs_virtio_devices/src/vsock/packet.rs rename to src/dragonball/dbs_virtio_devices/src/vsock/packet.rs index bbdd5f3820..c25df09a20 100644 --- a/src/dragonball/src/dbs_virtio_devices/src/vsock/packet.rs +++ b/src/dragonball/dbs_virtio_devices/src/vsock/packet.rs @@ -78,7 +78,7 @@ pub struct VsockPacketHdr { /// - VSOCK_OP_RW: a data packet; /// - VSOCK_OP_REQUEST: connection request; /// - VSOCK_OP_RST: forcefull connection termination; - /// etc (see `super::defs::uapi` for the full list). + /// - etc (see `super::defs::uapi` for the full list). pub op: u16, /// Additional options (flags) associated with the current operation (`op`). /// Currently, only used with shutdown requests (VSOCK_OP_SHUTDOWN). diff --git a/src/dragonball/src/dbs_address_space/LICENSE b/src/dragonball/src/dbs_address_space/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_address_space/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_allocator/LICENSE b/src/dragonball/src/dbs_allocator/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_allocator/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_arch/LICENSE b/src/dragonball/src/dbs_arch/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_arch/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_arch/THIRD-PARTY b/src/dragonball/src/dbs_arch/THIRD-PARTY deleted file mode 120000 index 301d0a4989..0000000000 --- a/src/dragonball/src/dbs_arch/THIRD-PARTY +++ /dev/null @@ -1 +0,0 @@ -../../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_boot/LICENSE b/src/dragonball/src/dbs_boot/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_boot/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_boot/THIRD-PARTY b/src/dragonball/src/dbs_boot/THIRD-PARTY deleted file mode 120000 index 301d0a4989..0000000000 --- a/src/dragonball/src/dbs_boot/THIRD-PARTY +++ /dev/null @@ -1 +0,0 @@ -../../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_device/LICENSE b/src/dragonball/src/dbs_device/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_device/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_interrupt/LICENSE b/src/dragonball/src/dbs_interrupt/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_interrupt/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_legacy_devices/LICENSE b/src/dragonball/src/dbs_legacy_devices/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_legacy_devices/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_legacy_devices/THIRD-PARTY b/src/dragonball/src/dbs_legacy_devices/THIRD-PARTY deleted file mode 120000 index 301d0a4989..0000000000 --- a/src/dragonball/src/dbs_legacy_devices/THIRD-PARTY +++ /dev/null @@ -1 +0,0 @@ -../../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_upcall/LICENSE b/src/dragonball/src/dbs_upcall/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_upcall/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_utils/LICENSE b/src/dragonball/src/dbs_utils/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_utils/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_utils/THIRD-PARTY b/src/dragonball/src/dbs_utils/THIRD-PARTY deleted file mode 120000 index 301d0a4989..0000000000 --- a/src/dragonball/src/dbs_utils/THIRD-PARTY +++ /dev/null @@ -1 +0,0 @@ -../../THIRD-PARTY \ No newline at end of file diff --git a/src/dragonball/src/dbs_virtio_devices/LICENSE b/src/dragonball/src/dbs_virtio_devices/LICENSE deleted file mode 120000 index 30cff7403d..0000000000 --- a/src/dragonball/src/dbs_virtio_devices/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/src/dragonball/src/dbs_virtio_devices/THIRD-PARTY b/src/dragonball/src/dbs_virtio_devices/THIRD-PARTY deleted file mode 120000 index 301d0a4989..0000000000 --- a/src/dragonball/src/dbs_virtio_devices/THIRD-PARTY +++ /dev/null @@ -1 +0,0 @@ -../../THIRD-PARTY \ No newline at end of file diff --git a/src/runtime-rs/crates/hypervisor/Cargo.toml b/src/runtime-rs/crates/hypervisor/Cargo.toml index 8d07866c41..42be0de5cb 100644 --- a/src/runtime-rs/crates/hypervisor/Cargo.toml +++ b/src/runtime-rs/crates/hypervisor/Cargo.toml @@ -65,7 +65,7 @@ dragonball = { path = "../../../dragonball", features = [ "vhost-user-net", "host-device", ], optional = true } -dbs-utils = { path = "../../../dragonball/src/dbs_utils" } +dbs-utils = { path = "../../../dragonball/dbs_utils" } hyperlocal = "0.8.0" hyper = { version = "0.14.18", features = ["client"] } diff --git a/tests/cmd/check-spelling/data/acronyms.txt b/tests/cmd/check-spelling/data/acronyms.txt index 20e2f3de73..a58f4dcbfe 100644 --- a/tests/cmd/check-spelling/data/acronyms.txt +++ b/tests/cmd/check-spelling/data/acronyms.txt @@ -5,6 +5,7 @@ # Description: List of acronyms and abbreviations. ACPI/AB +acpi ACS/AB API/AB AUFS # Another Union FS @@ -23,6 +24,7 @@ DinD/B # Docker in Docker dind/B DMA/AB DPDK/AB +enum/A FaaS/B # Function as a Service FS/AB fs/B # For terms like "virtio-fs" @@ -85,6 +87,7 @@ TTY/AB UI/AB UTS/AB UUID/AB +util/A vCPU/AB VETH/AB VF/AB diff --git a/tests/cmd/check-spelling/data/main.txt b/tests/cmd/check-spelling/data/main.txt index 8947452b30..cc1ce77578 100644 --- a/tests/cmd/check-spelling/data/main.txt +++ b/tests/cmd/check-spelling/data/main.txt @@ -4,6 +4,7 @@ # # Description: General word list. +Acknowledgement ack/A arg # Argument auditability @@ -93,6 +94,7 @@ ramdisk/A readonly rebase/ACD refactor/ACD +regs remediate repo/A runtime/AB @@ -102,6 +104,8 @@ signoff/A snapshotter/AB stalebot/B startup +Submodule/A +submodule/A subdirectory/A swappiness sysctl/AB diff --git a/tests/cmd/check-spelling/kata-dictionary.dic b/tests/cmd/check-spelling/kata-dictionary.dic index cf58111970..37664f5ae0 100644 --- a/tests/cmd/check-spelling/kata-dictionary.dic +++ b/tests/cmd/check-spelling/kata-dictionary.dic @@ -1,10 +1,11 @@ -394 +401 ACPI/AB ACS/AB API/AB APIC AUFS AWS/AB +Acknowledgement Ansible/B AppArmor/B BDF/AB @@ -148,6 +149,7 @@ SaaS/B SemaphoreCI/B StratoVirt/B Struct/A +Submodule/A Sysbench/B TBD/AB TDX @@ -190,6 +192,7 @@ Yamux/B Zun/B aarch64/B ack/A +acpi amd64/B arg arm64/B @@ -234,6 +237,7 @@ dracut/B emptydir/A enablement/AB entrypoint/AB +enum/A ethernet fdt filename/AB @@ -325,6 +329,7 @@ readonly rebase/ACD refactor/ACD regexp/AB +regs remediate repo/A rkt/B/B @@ -350,6 +355,7 @@ stdin/AB stdout/AB struct/A subdirectory/A +submodule/A swappiness sysctl/AB syslog/AB @@ -374,6 +380,7 @@ untrusting upcall userid/AB userspace/B +util/A vCPU/AB vGPU vSphere/B