From 3f8cd52ffd74627242cb7e8ea1c2bdedadf6741a Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 8 May 2024 09:56:31 +0100 Subject: [PATCH] build: Format Cargo.toml files using taplo Run the taplo formatter with the newly added configuration file Signed-off-by: Rob Bradford --- Cargo.toml | 72 +++++++++++++++++----------------- api_client/Cargo.toml | 4 +- arch/Cargo.toml | 9 +++-- block/Cargo.toml | 10 +++-- devices/Cargo.toml | 6 +-- event_monitor/Cargo.toml | 4 +- fuzz/Cargo.toml | 44 ++++++++++----------- hypervisor/Cargo.toml | 36 ++++++++++------- net_gen/Cargo.toml | 4 +- net_util/Cargo.toml | 12 ++++-- option_parser/Cargo.toml | 4 +- pci/Cargo.toml | 16 +++++--- performance-metrics/Cargo.toml | 6 +-- rate_limiter/Cargo.toml | 2 +- serial_buffer/Cargo.toml | 4 +- test_infra/Cargo.toml | 4 +- tpm/Cargo.toml | 4 +- tracer/Cargo.toml | 4 +- vhost_user_block/Cargo.toml | 8 ++-- vhost_user_net/Cargo.toml | 8 ++-- virtio-devices/Cargo.toml | 21 +++++++--- vm-allocator/Cargo.toml | 4 +- vm-device/Cargo.toml | 6 +-- vm-migration/Cargo.toml | 11 ++++-- vm-virtio/Cargo.toml | 10 +++-- vmm/Cargo.toml | 29 ++++++++------ 26 files changed, 196 insertions(+), 146 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7f5c86d0e..d7664ef65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] +authors = ["The Cloud Hypervisor Authors"] +build = "build.rs" +default-run = "cloud-hypervisor" +description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM" +edition = "2021" +homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor" +license = "LICENSE-APACHE & LICENSE-BSD-3-Clause" name = "cloud-hypervisor" version = "39.0.0" -authors = ["The Cloud Hypervisor Authors"] -edition = "2021" -default-run = "cloud-hypervisor" -build = "build.rs" -license = "LICENSE-APACHE & LICENSE-BSD-3-Clause" -description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM" -homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor" # Minimum buildable version: # Keep in sync with version in .github/workflows/build.yaml # Policy on MSRV (see #4318): @@ -18,15 +18,15 @@ homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor" rust-version = "1.77.0" [profile.release] -lto = true codegen-units = 1 +lto = true opt-level = "s" strip = true [profile.profiling] +debug = true inherits = "release" strip = false -debug = true [dependencies] anyhow = "1.0.81" @@ -43,11 +43,11 @@ seccompiler = "0.4.0" serde_json = "1.0.115" signal-hook = "0.3.17" thiserror = "1.0.60" -tpm = { path = "tpm"} +tpm = { path = "tpm" } tracer = { path = "tracer" } +vm-memory = "0.14.1" vmm = { path = "vmm" } vmm-sys-util = "0.12.1" -vm-memory = "0.14.1" zbus = { version = "3.15.2", optional = true } [dev-dependencies] @@ -61,9 +61,9 @@ wait-timeout = "0.2.0" # Please adjust `vmm::feature_list()` accordingly when changing the # feature list below [features] -default = ["kvm", "io_uring"] dbus_api = ["zbus", "vmm/dbus_api"] -dhat-heap = ["dhat", "vmm/dhat-heap"] # For heap profiling +default = ["kvm", "io_uring"] +dhat-heap = ["dhat", "vmm/dhat-heap"] # For heap profiling guest_debug = ["vmm/guest_debug"] igvm = ["vmm/igvm", "mshv"] io_uring = ["vmm/io_uring"] @@ -75,27 +75,27 @@ tracing = ["vmm/tracing", "tracer/tracing"] [workspace] members = [ - "api_client", - "arch", - "block", - "devices", - "event_monitor", - "hypervisor", - "net_gen", - "net_util", - "option_parser", - "pci", - "performance-metrics", - "rate_limiter", - "serial_buffer", - "test_infra", - "tracer", - "vhost_user_block", - "vhost_user_net", - "virtio-devices", - "vmm", - "vm-allocator", - "vm-device", - "vm-migration", - "vm-virtio" + "api_client", + "arch", + "block", + "devices", + "event_monitor", + "hypervisor", + "net_gen", + "net_util", + "option_parser", + "pci", + "performance-metrics", + "rate_limiter", + "serial_buffer", + "test_infra", + "tracer", + "vhost_user_block", + "vhost_user_net", + "virtio-devices", + "vmm", + "vm-allocator", + "vm-device", + "vm-migration", + "vm-virtio", ] diff --git a/api_client/Cargo.toml b/api_client/Cargo.toml index e2fba5262..f24360b4e 100644 --- a/api_client/Cargo.toml +++ b/api_client/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "api_client" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "api_client" +version = "0.1.0" [dependencies] vmm-sys-util = "0.12.1" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 232f54699..a27cb70d6 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "arch" -version = "0.1.0" authors = ["The Chromium OS Authors"] edition = "2021" +name = "arch" +version = "0.1.0" [features] default = [] @@ -19,7 +19,10 @@ log = "0.4.21" serde = { version = "1.0.197", features = ["rc", "derive"] } thiserror = "1.0.60" uuid = "1.8.0" -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-bitmap", +] } vm-migration = { path = "../vm-migration" } vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } diff --git a/block/Cargo.toml b/block/Cargo.toml index 0e3af4386..72880c522 100644 --- a/block/Cargo.toml +++ b/block/Cargo.toml @@ -1,8 +1,8 @@ [package] +authors = ["The Cloud Hypervisor Authors", "The Chromium OS Authors"] +edition = "2021" name = "block" version = "0.1.0" -edition = "2021" -authors = ["The Cloud Hypervisor Authors", "The Chromium OS Authors"] [features] default = [] @@ -21,6 +21,10 @@ thiserror = "1.0.60" uuid = { version = "1.8.0", features = ["v4"] } virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-queue = "0.12.0" -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.12.1" diff --git a/devices/Cargo.toml b/devices/Cargo.toml index 91541ccde..97d37469a 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "devices" -version = "0.1.0" authors = ["The Chromium OS Authors"] edition = "2021" +name = "devices" +version = "0.1.0" [dependencies] -acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } +acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } anyhow = "1.0.81" arch = { path = "../arch" } bitflags = "2.5.0" diff --git a/event_monitor/Cargo.toml b/event_monitor/Cargo.toml index 0fd5ceba8..bf6724834 100644 --- a/event_monitor/Cargo.toml +++ b/event_monitor/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "event_monitor" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "event_monitor" +version = "0.1.0" [dependencies] flume = "0.11.0" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index cc8f56ca3..eef0093af 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "cloud-hypervisor-fuzz" -version = "0.0.0" authors = ["Automatically generated"] -publish = false edition = "2021" +name = "cloud-hypervisor-fuzz" +publish = false +version = "0.0.0" [package.metadata] cargo-fuzz = true @@ -24,12 +24,12 @@ once_cell = "1.19.0" seccompiler = "0.4.0" virtio-devices = { path = "../virtio-devices" } virtio-queue = "0.12.0" -vmm = { path = "../vmm", features = ["guest_debug"]} -vmm-sys-util = "0.12.1" +vm-device = { path = "../vm-device" } vm-memory = "0.14.1" vm-migration = { path = "../vm-migration" } -vm-device = { path = "../vm-device" } vm-virtio = { path = "../vm-virtio" } +vmm = { path = "../vmm", features = ["guest_debug"] } +vmm-sys-util = "0.12.1" [dependencies.cloud-hypervisor] path = ".." @@ -39,97 +39,97 @@ path = ".." members = ["."] [[bin]] +doc = false name = "balloon" path = "fuzz_targets/balloon.rs" test = false -doc = false [[bin]] +doc = false name = "block" path = "fuzz_targets/block.rs" test = false -doc = false [[bin]] +doc = false name = "cmos" path = "fuzz_targets/cmos.rs" test = false -doc = false [[bin]] +doc = false name = "console" path = "fuzz_targets/console.rs" test = false -doc = false [[bin]] +doc = false name = "http_api" path = "fuzz_targets/http_api.rs" test = false -doc = false [[bin]] +doc = false name = "iommu" path = "fuzz_targets/iommu.rs" test = false -doc = false [[bin]] +doc = false name = "linux_loader" path = "fuzz_targets/linux_loader.rs" test = false -doc = false [[bin]] +doc = false name = "linux_loader_cmdline" path = "fuzz_targets/linux_loader_cmdline.rs" test = false -doc = false [[bin]] +doc = false name = "mem" path = "fuzz_targets/mem.rs" test = false -doc = false [[bin]] +doc = false name = "net" path = "fuzz_targets/net.rs" test = false -doc = false [[bin]] +doc = false name = "pmem" path = "fuzz_targets/pmem.rs" test = false -doc = false [[bin]] +doc = false name = "qcow" path = "fuzz_targets/qcow.rs" test = false -doc = false [[bin]] +doc = false name = "rng" path = "fuzz_targets/rng.rs" test = false -doc = false [[bin]] +doc = false name = "serial" path = "fuzz_targets/serial.rs" test = false -doc = false [[bin]] +doc = false name = "vhdx" path = "fuzz_targets/vhdx.rs" test = false -doc = false [[bin]] +doc = false name = "watchdog" path = "fuzz_targets/watchdog.rs" test = false -doc = false diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index cb6f4aa57..e2463867a 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "hypervisor" -version = "0.1.0" authors = ["Microsoft Authors"] edition = "2021" license = "Apache-2.0 OR BSD-3-Clause" +name = "hypervisor" +version = "0.1.0" [features] kvm = ["kvm-ioctls", "kvm-bindings", "vfio-ioctls/kvm"] @@ -14,26 +14,34 @@ tdx = [] [dependencies] anyhow = "1.0.81" byteorder = "1.5.0" -igvm = { version = "0.2.0", optional = true } -igvm_defs = { version = "0.2.0", optional = true } -libc = "0.2.153" -log = "0.4.21" +igvm = { version = "0.2.0", optional = true } +igvm_defs = { version = "0.2.0", optional = true } kvm-bindings = { version = "0.8.1", optional = true, features = ["serde"] } kvm-ioctls = { version = "0.17.0", optional = true } -mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true } -mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true} +libc = "0.2.153" +log = "0.4.21" +mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = [ + "with-serde", + "fam-wrappers", +], optional = true } +mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true } serde = { version = "1.0.197", features = ["rc", "derive"] } -serde_with = { version = "3.7.0", default-features = false, features = ["macros"] } -vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic"] } -vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } +serde_with = { version = "3.7.0", default-features = false, features = [ + "macros", +] } thiserror = "1.0.60" +vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", +] } +vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] -optional = true -version = "1.21.0" default-features = false features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"] +optional = true +version = "1.21.0" [dev-dependencies] env_logger = "0.11.3" diff --git a/net_gen/Cargo.toml b/net_gen/Cargo.toml index cb7baa863..a12644471 100644 --- a/net_gen/Cargo.toml +++ b/net_gen/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "net_gen" -version = "0.1.0" authors = ["The Chromium OS Authors"] edition = "2021" +name = "net_gen" +version = "0.1.0" [dependencies] vmm-sys-util = "0.12.1" diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 90ae8e35b..d6b62bceb 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "net_util" -version = "0.1.0" authors = ["The Chromium OS Authors"] edition = "2021" +name = "net_util" +version = "0.1.0" [dependencies] epoll = "4.3.3" @@ -11,11 +11,15 @@ libc = "0.2.153" log = "0.4.21" net_gen = { path = "../net_gen" } rate_limiter = { path = "../rate_limiter" } -serde = {version = "1.0.197",features = ["derive"]} +serde = { version = "1.0.197", features = ["derive"] } thiserror = "1.0.60" virtio-bindings = "0.2.2" virtio-queue = "0.12.0" -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.12.1" diff --git a/option_parser/Cargo.toml b/option_parser/Cargo.toml index 99a09648a..23fbd4752 100644 --- a/option_parser/Cargo.toml +++ b/option_parser/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "option_parser" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "option_parser" +version = "0.1.0" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index e28be6801..72fbaa9eb 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "pci" -version = "0.1.0" authors = ["Samuel Ortiz "] edition = "2021" +name = "pci" +version = "0.1.0" [features] default = [] @@ -13,16 +13,22 @@ mshv = ["vfio-ioctls/mshv"] anyhow = "1.0.81" byteorder = "1.5.0" hypervisor = { path = "../hypervisor" } -vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] } +vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = [ + "fam-wrappers", +] } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" } -vmm-sys-util = "0.12.1" libc = "0.2.153" log = "0.4.21" serde = { version = "1.0.197", features = ["derive"] } thiserror = "1.0.60" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } vm-migration = { path = "../vm-migration" } +vmm-sys-util = "0.12.1" diff --git a/performance-metrics/Cargo.toml b/performance-metrics/Cargo.toml index cc7b3dea8..4a593fd8a 100644 --- a/performance-metrics/Cargo.toml +++ b/performance-metrics/Cargo.toml @@ -1,9 +1,9 @@ [package] +authors = ["The Cloud Hypervisor Authors"] +build = "../build.rs" +edition = "2021" name = "performance-metrics" version = "0.1.0" -authors = ["The Cloud Hypervisor Authors"] -edition = "2021" -build = "../build.rs" [dependencies] clap = { version = "4.5.4", features = ["wrap_help"] } diff --git a/rate_limiter/Cargo.toml b/rate_limiter/Cargo.toml index f0b541e31..ef0c537fe 100644 --- a/rate_limiter/Cargo.toml +++ b/rate_limiter/Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "rate_limiter" version = "0.1.0" -edition = "2021" [dependencies] epoll = "4.3.3" diff --git a/serial_buffer/Cargo.toml b/serial_buffer/Cargo.toml index f5329eb2d..2c3993cff 100644 --- a/serial_buffer/Cargo.toml +++ b/serial_buffer/Cargo.toml @@ -1,5 +1,5 @@ [package] +authors = ["The Cloud Hypervisor Authors"] +edition = "2021" name = "serial_buffer" version = "0.1.0" -authors = ["The Cloud Hypervisor Authors"] -edition = "2021" \ No newline at end of file diff --git a/test_infra/Cargo.toml b/test_infra/Cargo.toml index a65fd1c95..e1b2683aa 100644 --- a/test_infra/Cargo.toml +++ b/test_infra/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "test_infra" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "test_infra" +version = "0.1.0" [dependencies] dirs = "5.0.1" diff --git a/tpm/Cargo.toml b/tpm/Cargo.toml index 91047aa67..34c150d46 100644 --- a/tpm/Cargo.toml +++ b/tpm/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "tpm" -edition = "2021" authors = ["Microsoft Authors"] +edition = "2021" license = "Apache-2.0" +name = "tpm" version = "0.1.0" [dependencies] diff --git a/tracer/Cargo.toml b/tracer/Cargo.toml index f5b5e5b98..5cc57d1ce 100644 --- a/tracer/Cargo.toml +++ b/tracer/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "tracer" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "tracer" +version = "0.1.0" [dependencies] libc = "0.2.153" diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 5afe36659..d4634183e 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -1,13 +1,13 @@ [package] +authors = ["The Cloud Hypervisor Authors"] +build = "../build.rs" +edition = "2021" name = "vhost_user_block" version = "0.1.0" -authors = ["The Cloud Hypervisor Authors"] -edition = "2021" -build = "../build.rs" [dependencies] -clap = { version = "4.5.4", features = ["wrap_help","cargo"] } block = { path = "../block" } +clap = { version = "4.5.4", features = ["wrap_help", "cargo"] } env_logger = "0.11.3" epoll = "4.3.3" libc = "0.2.153" diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 517544021..285786e0d 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -1,12 +1,12 @@ [package] +authors = ["The Cloud Hypervisor Authors"] +build = "../build.rs" +edition = "2021" name = "vhost_user_net" version = "0.1.0" -authors = ["The Cloud Hypervisor Authors"] -edition = "2021" -build = "../build.rs" [dependencies] -clap = { version = "4.5.4", features = ["wrap_help","cargo"] } +clap = { version = "4.5.4", features = ["wrap_help", "cargo"] } env_logger = "0.11.3" epoll = "4.3.3" libc = "0.2.153" diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index 286835085..b39a0b05d 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "virtio-devices" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "virtio-devices" +version = "0.1.0" [features] default = [] @@ -24,15 +24,26 @@ rate_limiter = { path = "../rate_limiter" } seccompiler = "0.4.0" serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.115" -serde_with = { version = "3.7.0", default-features = false, features = ["macros"] } +serde_with = { version = "3.7.0", default-features = false, features = [ + "macros", +] } serial_buffer = { path = "../serial_buffer" } thiserror = "1.0.60" -vhost = { version = "0.11.0", features = ["vhost-user-frontend", "vhost-user-backend", "vhost-kern", "vhost-vdpa"] } +vhost = { version = "0.11.0", features = [ + "vhost-user-frontend", + "vhost-user-backend", + "vhost-kern", + "vhost-vdpa", +] } virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-queue = "0.12.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.12.1" diff --git a/vm-allocator/Cargo.toml b/vm-allocator/Cargo.toml index 08207de7c..859cb0baa 100644 --- a/vm-allocator/Cargo.toml +++ b/vm-allocator/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "vm-allocator" -version = "0.1.0" authors = ["The Chromium OS Authors"] edition = "2021" +name = "vm-allocator" +version = "0.1.0" [dependencies] libc = "0.2.153" diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index a443e80b3..9c24e085a 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "vm-device" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "vm-device" +version = "0.1.0" [features] default = [] @@ -12,8 +12,8 @@ mshv = ["vfio-ioctls/mshv"] [dependencies] anyhow = "1.0.81" hypervisor = { path = "../hypervisor" } -thiserror = "1.0.60" serde = { version = "1.0.197", features = ["rc", "derive"] } +thiserror = "1.0.60" vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vm-memory = { version = "0.14.1", features = ["backend-mmap"] } vmm-sys-util = "0.12.1" diff --git a/vm-migration/Cargo.toml b/vm-migration/Cargo.toml index 0d670a50f..ceec510f3 100644 --- a/vm-migration/Cargo.toml +++ b/vm-migration/Cargo.toml @@ -1,12 +1,15 @@ [package] -name = "vm-migration" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "vm-migration" +version = "0.1.0" [dependencies] anyhow = "1.0.81" -thiserror = "1.0.60" serde = { version = "1.0.197", features = ["rc", "derive"] } serde_json = "1.0.115" -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic"] } +thiserror = "1.0.60" +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", +] } diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index b7f60c59d..62cf31b3d 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "vm-virtio" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "vm-virtio" +version = "0.1.0" [features] default = [] @@ -10,4 +10,8 @@ default = [] [dependencies] log = "0.4.21" virtio-queue = "0.12.0" -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index f43c1ecb8..a70cedee8 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "vmm" -version = "0.1.0" authors = ["The Cloud Hypervisor Authors"] edition = "2021" +name = "vmm" +version = "0.1.0" [features] -default = [] dbus_api = ["blocking", "futures", "zbus"] -dhat-heap = ["dhat"] # For heap profiling +default = [] +dhat-heap = ["dhat"] # For heap profiling guest_debug = ["kvm", "gdbstub", "gdbstub_arch"] -igvm = ["hex", "dep:igvm", "igvm_defs", "mshv-bindings", "range_map_vec"] +igvm = ["hex", "dep:igvm", "igvm_defs", "mshv-bindings", "range_map_vec"] io_uring = ["block/io_uring"] kvm = ["hypervisor/kvm", "vfio-ioctls/kvm", "vm-device/kvm", "pci/kvm"] mshv = ["hypervisor/mshv", "vfio-ioctls/mshv", "vm-device/mshv", "pci/mshv"] @@ -18,7 +18,7 @@ tdx = ["arch/tdx", "hypervisor/tdx"] tracing = ["tracer/tracing"] [dependencies] -acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } +acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } anyhow = "1.0.81" arc-swap = "1.7.1" arch = { path = "../arch" } @@ -37,13 +37,16 @@ gdbstub = { version = "0.7.1", optional = true } gdbstub_arch = { version = "0.3.0", optional = true } hex = { version = "0.4.3", optional = true } hypervisor = { path = "../hypervisor" } -igvm = { version = "0.2.0", optional = true } -igvm_defs = { version = "0.2.0", optional = true } +igvm = { version = "0.2.0", optional = true } +igvm_defs = { version = "0.2.0", optional = true } libc = "0.2.153" linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] } log = "0.4.21" micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" } -mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true } +mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = [ + "with-serde", + "fam-wrappers", +], optional = true } net_util = { path = "../net_util" } once_cell = "1.19.0" option_parser = { path = "../option_parser" } @@ -64,9 +67,13 @@ virtio-devices = { path = "../virtio-devices" } virtio-queue = "0.12.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.14.1", features = [ + "backend-mmap", + "backend-atomic", + "backend-bitmap", +] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } zbus = { version = "3.15.2", optional = true } -zerocopy = { version = "0.7.32", features = ["alloc","derive"] } +zerocopy = { version = "0.7.32", features = ["alloc", "derive"] }