build: Fix Cargo.toml formatting

In 42e9632c53 a fix was made to address a
typo in the taplo configuration file. Fixing this typo indicated that
many Cargo.toml files were no longer adhering to the formatting rules.
Fix the formatting by running `taplo fmt`.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2024-06-18 15:22:36 +01:00 committed by Bo Chen
parent 243dc5918c
commit 08cf983d42
18 changed files with 41 additions and 41 deletions

View File

@ -61,17 +61,17 @@ wait-timeout = "0.2.0"
# Please adjust `vmm::feature_list()` accordingly when changing the # Please adjust `vmm::feature_list()` accordingly when changing the
# feature list below # feature list below
[features] [features]
dbus_api = ["zbus", "vmm/dbus_api"] dbus_api = ["vmm/dbus_api", "zbus"]
default = ["kvm", "io_uring"] default = ["io_uring", "kvm"]
dhat-heap = ["dhat", "vmm/dhat-heap"] # For heap profiling dhat-heap = ["dhat", "vmm/dhat-heap"] # For heap profiling
guest_debug = ["vmm/guest_debug"] guest_debug = ["vmm/guest_debug"]
igvm = ["vmm/igvm", "mshv"] igvm = ["mshv", "vmm/igvm"]
io_uring = ["vmm/io_uring"] io_uring = ["vmm/io_uring"]
kvm = ["vmm/kvm"] kvm = ["vmm/kvm"]
mshv = ["vmm/mshv"] mshv = ["vmm/mshv"]
sev_snp = ["igvm", "vmm/sev_snp", "mshv"] sev_snp = ["igvm", "mshv", "vmm/sev_snp"]
tdx = ["vmm/tdx"] tdx = ["vmm/tdx"]
tracing = ["vmm/tracing", "tracer/tracing"] tracing = ["tracer/tracing", "vmm/tracing"]
[workspace] [workspace]
members = [ members = [
@ -93,9 +93,9 @@ members = [
"vhost_user_block", "vhost_user_block",
"vhost_user_net", "vhost_user_net",
"virtio-devices", "virtio-devices",
"vmm",
"vm-allocator", "vm-allocator",
"vm-device", "vm-device",
"vm-migration", "vm-migration",
"vm-virtio", "vm-virtio",
"vmm",
] ]

View File

@ -14,14 +14,14 @@ anyhow = "1.0.81"
byteorder = "1.5.0" byteorder = "1.5.0"
hypervisor = { path = "../hypervisor" } hypervisor = { path = "../hypervisor" }
libc = "0.2.153" libc = "0.2.153"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] } linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.21" log = "0.4.21"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
thiserror = "1.0.60" thiserror = "1.0.60"
uuid = "1.8.0" uuid = "1.8.0"
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

View File

@ -1,5 +1,5 @@
[package] [package]
authors = ["The Cloud Hypervisor Authors", "The Chromium OS Authors"] authors = ["The Chromium OS Authors", "The Cloud Hypervisor Authors"]
edition = "2021" edition = "2021"
name = "block" name = "block"
version = "0.1.0" version = "0.1.0"
@ -22,9 +22,9 @@ uuid = { version = "1.8.0", features = ["v4"] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
virtio-queue = "0.12.0" virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1" vmm-sys-util = "0.12.1"

View File

@ -8,5 +8,5 @@ version = "0.1.0"
flume = "0.11.0" flume = "0.11.0"
libc = "0.2.153" libc = "0.2.153"
once_cell = "1.19.0" once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"

View File

@ -17,7 +17,7 @@ devices = { path = "../devices" }
epoll = "4.3.3" epoll = "4.3.3"
libc = "0.2.155" libc = "0.2.155"
libfuzzer-sys = "0.4.7" libfuzzer-sys = "0.4.7"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] } linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" } micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
net_util = { path = "../net_util" } net_util = { path = "../net_util" }
once_cell = "1.19.0" once_cell = "1.19.0"

View File

@ -6,8 +6,8 @@ name = "hypervisor"
version = "0.1.0" version = "0.1.0"
[features] [features]
kvm = ["kvm-ioctls", "kvm-bindings", "vfio-ioctls/kvm"] kvm = ["kvm-bindings", "kvm-ioctls", "vfio-ioctls/kvm"]
mshv = ["mshv-ioctls", "mshv-bindings", "vfio-ioctls/mshv", "iced-x86"] mshv = ["iced-x86", "mshv-bindings", "mshv-ioctls", "vfio-ioctls/mshv"]
sev_snp = ["igvm", "igvm_defs"] sev_snp = ["igvm", "igvm_defs"]
tdx = [] tdx = []
@ -21,25 +21,25 @@ kvm-ioctls = { version = "0.17.0", optional = true }
libc = "0.2.153" libc = "0.2.153"
log = "0.4.21" log = "0.4.21"
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [ mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [
"with-serde",
"fam-wrappers", "fam-wrappers",
"with-serde",
], optional = true } ], optional = true }
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", optional = true } mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", optional = true }
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_with = { version = "3.7.0", default-features = false, features = [ serde_with = { version = "3.7.0", default-features = false, features = [
"macros", "macros",
] } ] }
thiserror = "1.0.60" thiserror = "1.0.60"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-mmap",
] } ] }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
[target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
default-features = false default-features = false
features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"] features = ["decoder", "fast_fmt", "instr_info", "op_code_info", "std"]
optional = true optional = true
version = "1.21.0" version = "1.21.0"

View File

@ -16,9 +16,9 @@ thiserror = "1.0.60"
virtio-bindings = "0.2.2" virtio-bindings = "0.2.2"
virtio-queue = "0.12.0" virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1" vmm-sys-util = "0.12.1"

View File

@ -25,9 +25,9 @@ vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vmm-sys-util = "0.12.1" vmm-sys-util = "0.12.1"

View File

@ -8,7 +8,7 @@ version = "0.1.0"
[dependencies] [dependencies]
clap = { version = "4.5.4", features = ["wrap_help"] } clap = { version = "4.5.4", features = ["wrap_help"] }
dirs = "5.0.1" dirs = "5.0.1"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
test_infra = { path = "../test_infra" } test_infra = { path = "../test_infra" }
thiserror = "1.0.60" thiserror = "1.0.60"

View File

@ -9,7 +9,7 @@ dirs = "5.0.1"
epoll = "4.3.3" epoll = "4.3.3"
libc = "0.2.153" libc = "0.2.153"
once_cell = "1.19.0" once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
ssh2 = { version = "0.9.4", features = ["vendored-openssl"] } ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
vmm-sys-util = "0.12.1" vmm-sys-util = "0.12.1"

View File

@ -8,7 +8,7 @@ version = "0.1.0"
libc = "0.2.153" libc = "0.2.153"
log = "0.4.21" log = "0.4.21"
once_cell = "1.19.0" once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
[features] [features]

View File

@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies] [dependencies]
block = { path = "../block" } block = { path = "../block" }
clap = { version = "4.5.4", features = ["wrap_help", "cargo"] } clap = { version = "4.5.4", features = ["cargo", "wrap_help"] }
env_logger = "0.11.3" env_logger = "0.11.3"
epoll = "4.3.3" epoll = "4.3.3"
libc = "0.2.153" libc = "0.2.153"

View File

@ -6,7 +6,7 @@ name = "vhost_user_net"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
clap = { version = "4.5.4", features = ["wrap_help", "cargo"] } clap = { version = "4.5.4", features = ["cargo", "wrap_help"] }
env_logger = "0.11.3" env_logger = "0.11.3"
epoll = "4.3.3" epoll = "4.3.3"
libc = "0.2.153" libc = "0.2.153"

View File

@ -30,9 +30,9 @@ serde_with = { version = "3.7.0", default-features = false, features = [
serial_buffer = { path = "../serial_buffer" } serial_buffer = { path = "../serial_buffer" }
thiserror = "1.0.60" thiserror = "1.0.60"
vhost = { version = "0.11.0", features = [ vhost = { version = "0.11.0", features = [
"vhost-user-frontend",
"vhost-user-backend",
"vhost-kern", "vhost-kern",
"vhost-user-backend",
"vhost-user-frontend",
"vhost-vdpa", "vhost-vdpa",
] } ] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
@ -40,9 +40,9 @@ virtio-queue = "0.12.0"
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }

View File

@ -12,7 +12,7 @@ mshv = ["vfio-ioctls/mshv"]
[dependencies] [dependencies]
anyhow = "1.0.81" anyhow = "1.0.81"
hypervisor = { path = "../hypervisor" } hypervisor = { path = "../hypervisor" }
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
thiserror = "1.0.60" thiserror = "1.0.60"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = ["backend-mmap"] } vm-memory = { version = "0.14.1", features = ["backend-mmap"] }

View File

@ -6,10 +6,10 @@ version = "0.1.0"
[dependencies] [dependencies]
anyhow = "1.0.81" anyhow = "1.0.81"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
thiserror = "1.0.60" thiserror = "1.0.60"
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-mmap",
] } ] }

View File

@ -11,7 +11,7 @@ default = []
log = "0.4.21" log = "0.4.21"
virtio-queue = "0.12.0" virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }

View File

@ -8,11 +8,11 @@ version = "0.1.0"
dbus_api = ["blocking", "futures", "zbus"] dbus_api = ["blocking", "futures", "zbus"]
default = [] default = []
dhat-heap = ["dhat"] # For heap profiling dhat-heap = ["dhat"] # For heap profiling
guest_debug = ["kvm", "gdbstub", "gdbstub_arch"] guest_debug = ["gdbstub", "gdbstub_arch", "kvm"]
igvm = ["hex", "dep:igvm", "igvm_defs", "mshv-bindings", "range_map_vec"] igvm = ["dep:igvm", "hex", "igvm_defs", "mshv-bindings", "range_map_vec"]
io_uring = ["block/io_uring"] io_uring = ["block/io_uring"]
kvm = ["hypervisor/kvm", "vfio-ioctls/kvm", "vm-device/kvm", "pci/kvm"] kvm = ["hypervisor/kvm", "pci/kvm", "vfio-ioctls/kvm", "vm-device/kvm"]
mshv = ["hypervisor/mshv", "vfio-ioctls/mshv", "vm-device/mshv", "pci/mshv"] mshv = ["hypervisor/mshv", "pci/mshv", "vfio-ioctls/mshv", "vm-device/mshv"]
sev_snp = ["arch/sev_snp", "hypervisor/sev_snp", "virtio-devices/sev_snp"] sev_snp = ["arch/sev_snp", "hypervisor/sev_snp", "virtio-devices/sev_snp"]
tdx = ["arch/tdx", "hypervisor/tdx"] tdx = ["arch/tdx", "hypervisor/tdx"]
tracing = ["tracer/tracing"] tracing = ["tracer/tracing"]
@ -40,12 +40,12 @@ hypervisor = { path = "../hypervisor" }
igvm = { version = "0.3.1", optional = true } igvm = { version = "0.3.1", optional = true }
igvm_defs = { version = "0.3.1", optional = true } igvm_defs = { version = "0.3.1", optional = true }
libc = "0.2.153" libc = "0.2.153"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] } linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.21" log = "0.4.21"
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" } micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [ mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [
"with-serde",
"fam-wrappers", "fam-wrappers",
"with-serde",
], optional = true } ], optional = true }
net_util = { path = "../net_util" } net_util = { path = "../net_util" }
once_cell = "1.19.0" once_cell = "1.19.0"
@ -54,7 +54,7 @@ pci = { path = "../pci" }
range_map_vec = { version = "0.2.0", optional = true } range_map_vec = { version = "0.2.0", optional = true }
rate_limiter = { path = "../rate_limiter" } rate_limiter = { path = "../rate_limiter" }
seccompiler = "0.4.0" seccompiler = "0.4.0"
serde = { version = "1.0.197", features = ["rc", "derive"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
serial_buffer = { path = "../serial_buffer" } serial_buffer = { path = "../serial_buffer" }
signal-hook = "0.3.17" signal-hook = "0.3.17"
@ -68,9 +68,9 @@ virtio-queue = "0.12.0"
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [ vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }