External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-02 11:05:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Centralize rust-vmm crates to workspace

Browse Source 
Modify `Cargo.toml` in each member crate to follow the dependencies
specified in root `Cargo.toml` file.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
Ruoqing He 2024-09-27 02:27:43 +00:00 committed by Rob Bradford
parent ea4be45bb0
commit 5a70d7ec69
20 changed files with 85 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.toml
View File

@ -39,15 +39,15 @@ hypervisor = { path = "hypervisor" }
libc = "0.2.158" libc = "0.2.158"
log = { version = "0.4.22", features = ["std"] } log = { version = "0.4.22", features = ["std"] }
option_parser = { path = "option_parser" } option_parser = { path = "option_parser" }
seccompiler = "0.4.0" seccompiler = { workspace = true }
serde_json = "1.0.120" serde_json = "1.0.120"
signal-hook = "0.3.17" signal-hook = "0.3.17"
thiserror = "1.0.62" thiserror = "1.0.62"
tpm = { path = "tpm" } tpm = { path = "tpm" }
tracer = { path = "tracer" } tracer = { path = "tracer" }
vm-memory = "0.15.0" vm-memory = { workspace = true }
vmm = { path = "vmm" } vmm = { path = "vmm" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }
zbus = { version = "4.1.2", optional = true } zbus = { version = "4.1.2", optional = true }
[dev-dependencies] [dev-dependencies]
@ -100,3 +100,21 @@ members = [
"vm-virtio", "vm-virtio",
"vmm", "vmm",
] ]
[workspace.dependencies]
acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" }
kvm-bindings = "0.9.1"
kvm-ioctls = "0.18.0"
linux-loader = "0.12.0"
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0" }
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0" }
seccompiler = "0.4.0"
vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main" }
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main" }
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
vhost = "0.12.0"
virtio-bindings = "0.2.2"
virtio-queue = "0.13.0"
vm-fdt = { git = "https://github.com/rust-vmm/vm-fdt", branch = "main" }
vm-memory = "0.15.0"
vmm-sys-util = "0.12.1"

2
api_client/Cargo.toml
View File

@ -6,4 +6,4 @@ version = "0.1.0"
[dependencies] [dependencies]
thiserror = "1.0.62" thiserror = "1.0.62"
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

11
arch/Cargo.toml
View File

@ -15,18 +15,15 @@ anyhow = "1.0.87"
byteorder = "1.5.0" byteorder = "1.5.0"
hypervisor = { path = "../hypervisor" } hypervisor = { path = "../hypervisor" }
libc = "0.2.158" libc = "0.2.158"
linux-loader = { version = "0.12.0", features = ["bzimage", "elf", "pe"] } linux-loader = { workspace = true, features = ["bzimage", "elf", "pe"] }
log = "0.4.22" log = "0.4.22"
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
thiserror = "1.0.62" thiserror = "1.0.62"
uuid = "1.8.0" uuid = "1.8.0"
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = ["backend-bitmap", "backend-mmap"] }
"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 = { workspace = true, features = ["with-serde"] }
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
fdt_parser = { version = "0.1.5", package = "fdt" } fdt_parser = { version = "0.1.5", package = "fdt" }
vm-fdt = { git = "https://github.com/rust-vmm/vm-fdt", branch = "main" } vm-fdt = { workspace = true }

8
block/Cargo.toml
View File

@ -19,12 +19,12 @@ serde = { version = "1.0.208", features = ["derive"] }
smallvec = "1.13.2" smallvec = "1.13.2"
thiserror = "1.0.62" thiserror = "1.0.62"
uuid = { version = "1.8.0", features = ["v4"] } uuid = { version = "1.8.0", features = ["v4"] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-bindings = { workspace = true, features = ["virtio-v5_0_0"] }
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

6
devices/Cargo.toml
View File

@ -5,7 +5,7 @@ name = "devices"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } acpi_tables = { workspace = true }
anyhow = "1.0.87" anyhow = "1.0.87"
arch = { path = "../arch" } arch = { path = "../arch" }
bitflags = "2.6.0" bitflags = "2.6.0"
@ -21,13 +21,13 @@ thiserror = "1.0.62"
tpm = { path = "../tpm" } tpm = { path = "../tpm" }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
arch = { path = "../arch" } arch = { path = "../arch" }

17
hypervisor/Cargo.toml
View File

@ -18,26 +18,23 @@ cfg-if = "1.0.0"
concat-idents = "1.1.5" concat-idents = "1.1.5"
igvm = { version = "0.3.3", optional = true } igvm = { version = "0.3.3", optional = true }
igvm_defs = { version = "0.3.1", optional = true } igvm_defs = { version = "0.3.1", optional = true }
kvm-bindings = { version = "0.9.1", optional = true, features = ["serde"] } kvm-bindings = { workspace = true, optional = true, features = ["serde"] }
kvm-ioctls = { version = "0.18.0", optional = true } kvm-ioctls = { workspace = true, optional = true }
libc = "0.2.158" libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0", features = [ mshv-bindings = { workspace = true, features = [
"fam-wrappers", "fam-wrappers",
"with-serde", "with-serde",
], optional = true } ], optional = true }
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0", optional = true } mshv-ioctls = { workspace = true, optional = true }
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
serde_with = { version = "3.9.0", default-features = false, features = [ serde_with = { version = "3.9.0", default-features = false, features = [
"macros", "macros",
] } ] }
thiserror = "1.0.62" thiserror = "1.0.62"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio-ioctls = { workspace = true, default-features = false }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = ["backend-atomic", "backend-mmap"] }
"backend-atomic", vmm-sys-util = { workspace = true, features = ["with-serde"] }
"backend-mmap",
] }
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

2
net_gen/Cargo.toml
View File

@ -5,4 +5,4 @@ name = "net_gen"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

8
net_util/Cargo.toml
View File

@ -13,15 +13,15 @@ net_gen = { path = "../net_gen" }
rate_limiter = { path = "../rate_limiter" } rate_limiter = { path = "../rate_limiter" }
serde = { version = "1.0.208", features = ["derive"] } serde = { version = "1.0.208", features = ["derive"] }
thiserror = "1.0.62" thiserror = "1.0.62"
virtio-bindings = "0.2.2" virtio-bindings = { workspace = true }
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }
[dev-dependencies] [dev-dependencies]
once_cell = "1.19.0" once_cell = "1.19.0"

12
pci/Cargo.toml
View File

@ -17,17 +17,15 @@ libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
serde = { version = "1.0.208", features = ["derive"] } serde = { version = "1.0.208", features = ["derive"] }
thiserror = "1.0.62" thiserror = "1.0.62"
vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = [ vfio-bindings = { workspace = true, features = ["fam-wrappers"] }
"fam-wrappers", vfio-ioctls = { workspace = true, default-features = false }
] } vfio_user = { workspace = true }
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" }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

2
rate_limiter/Cargo.toml
View File

@ -8,4 +8,4 @@ epoll = "4.3.3"
libc = "0.2.158" libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
thiserror = "1.0.62" thiserror = "1.0.62"
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

2
test_infra/Cargo.toml
View File

@ -12,5 +12,5 @@ once_cell = "1.19.0"
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
serde_json = "1.0.120" serde_json = "1.0.120"
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 = { workspace = true }
wait-timeout = "0.2.0" wait-timeout = "0.2.0"

2
tpm/Cargo.toml
View File

@ -12,4 +12,4 @@ libc = "0.2.153"
log = "0.4.21" log = "0.4.21"
net_gen = { path = "../net_gen" } net_gen = { path = "../net_gen" }
thiserror = "1.0.58" thiserror = "1.0.58"
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

10
vhost_user_block/Cargo.toml
View File

@ -13,9 +13,9 @@ epoll = "4.3.3"
libc = "0.2.158" libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
option_parser = { path = "../option_parser" } option_parser = { path = "../option_parser" }
vhost = { version = "0.12.0", features = ["vhost-user-backend"] } vhost = { workspace = true, features = ["vhost-user-backend"] }
vhost-user-backend = "0.16.0" vhost-user-backend = "0.16.0"
virtio-bindings = "0.2.2" virtio-bindings = { workspace = true }
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-memory = "0.15.0" vm-memory = { workspace = true }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

8
vhost_user_net/Cargo.toml
View File

@ -13,8 +13,8 @@ libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
net_util = { path = "../net_util" } net_util = { path = "../net_util" }
option_parser = { path = "../option_parser" } option_parser = { path = "../option_parser" }
vhost = { version = "0.12.0", features = ["vhost-user-backend"] } vhost = { workspace = true, features = ["vhost-user-backend"] }
vhost-user-backend = "0.16.0" vhost-user-backend = "0.16.0"
virtio-bindings = "0.2.2" virtio-bindings = { workspace = true }
vm-memory = "0.15.0" vm-memory = { workspace = true }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

14
virtio-devices/Cargo.toml
View File

@ -17,12 +17,12 @@ epoll = "4.3.3"
event_monitor = { path = "../event_monitor" } event_monitor = { path = "../event_monitor" }
libc = "0.2.158" libc = "0.2.158"
log = "0.4.22" log = "0.4.22"
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0", optional = true } mshv-ioctls = { workspace = true, optional = true }
net_gen = { path = "../net_gen" } net_gen = { path = "../net_gen" }
net_util = { path = "../net_util" } net_util = { path = "../net_util" }
pci = { path = "../pci" } pci = { path = "../pci" }
rate_limiter = { path = "../rate_limiter" } rate_limiter = { path = "../rate_limiter" }
seccompiler = "0.4.0" seccompiler = { workspace = true }
serde = { version = "1.0.208", features = ["derive"] } serde = { version = "1.0.208", features = ["derive"] }
serde_json = "1.0.120" serde_json = "1.0.120"
serde_with = { version = "3.9.0", default-features = false, features = [ serde_with = { version = "3.9.0", default-features = false, features = [
@ -30,21 +30,21 @@ serde_with = { version = "3.9.0", default-features = false, features = [
] } ] }
serial_buffer = { path = "../serial_buffer" } serial_buffer = { path = "../serial_buffer" }
thiserror = "1.0.62" thiserror = "1.0.62"
vhost = { version = "0.12.0", features = [ vhost = { workspace = true, features = [
"vhost-kern", "vhost-kern",
"vhost-user-backend", "vhost-user-backend",
"vhost-user-frontend", "vhost-user-frontend",
"vhost-vdpa", "vhost-vdpa",
] } ] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] } virtio-bindings = { workspace = true, features = ["virtio-v5_0_0"] }
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

2
vm-allocator/Cargo.toml
View File

@ -6,7 +6,7 @@ version = "0.1.0"
[dependencies] [dependencies]
libc = "0.2.158" libc = "0.2.158"
vm-memory = "0.15.0" vm-memory = { workspace = true }
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
arch = { path = "../arch" } arch = { path = "../arch" }

6
vm-device/Cargo.toml
View File

@ -14,6 +14,6 @@ anyhow = "1.0.87"
hypervisor = { path = "../hypervisor" } hypervisor = { path = "../hypervisor" }
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
thiserror = "1.0.62" thiserror = "1.0.62"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio-ioctls = { workspace = true, default-features = false }
vm-memory = { version = "0.15.0", features = ["backend-mmap"] } vm-memory = { workspace = true, features = ["backend-mmap"] }
vmm-sys-util = "0.12.1" vmm-sys-util = { workspace = true }

5
vm-migration/Cargo.toml
View File

@ -9,7 +9,4 @@ anyhow = "1.0.87"
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
serde_json = "1.0.120" serde_json = "1.0.120"
thiserror = "1.0.62" thiserror = "1.0.62"
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = ["backend-atomic", "backend-mmap"] }
"backend-atomic",
"backend-mmap",
] }

4
vm-virtio/Cargo.toml
View File

@ -9,8 +9,8 @@ default = []
[dependencies] [dependencies]
log = "0.4.22" log = "0.4.22"
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",

18
vmm/Cargo.toml
View File

@ -25,7 +25,7 @@ tdx = ["arch/tdx", "hypervisor/tdx"]
tracing = ["tracer/tracing"] tracing = ["tracer/tracing"]
[dependencies] [dependencies]
acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" } acpi_tables = { workspace = true }
anyhow = "1.0.87" anyhow = "1.0.87"
arc-swap = "1.7.1" arc-swap = "1.7.1"
arch = { path = "../arch" } arch = { path = "../arch" }
@ -48,10 +48,10 @@ igvm = { version = "0.3.3", optional = true }
igvm_defs = { version = "0.3.1", optional = true } igvm_defs = { version = "0.3.1", optional = true }
landlock = "0.4.0" landlock = "0.4.0"
libc = "0.2.158" libc = "0.2.158"
linux-loader = { version = "0.12.0", features = ["bzimage", "elf", "pe"] } linux-loader = { workspace = true, features = ["bzimage", "elf", "pe"] }
log = "0.4.22" log = "0.4.22"
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.3.0", features = [ mshv-bindings = { workspace = true, features = [
"fam-wrappers", "fam-wrappers",
"with-serde", "with-serde",
], optional = true } ], optional = true }
@ -61,7 +61,7 @@ option_parser = { path = "../option_parser" }
pci = { path = "../pci" } 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 = { workspace = true }
serde = { version = "1.0.208", features = ["derive", "rc"] } serde = { version = "1.0.208", features = ["derive", "rc"] }
serde_json = "1.0.120" serde_json = "1.0.120"
serial_buffer = { path = "../serial_buffer" } serial_buffer = { path = "../serial_buffer" }
@ -69,19 +69,19 @@ signal-hook = "0.3.17"
thiserror = "1.0.62" thiserror = "1.0.62"
tracer = { path = "../tracer" } tracer = { path = "../tracer" }
uuid = "1.8.0" uuid = "1.8.0"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio-ioctls = { workspace = true, default-features = false }
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" } vfio_user = { workspace = true }
virtio-devices = { path = "../virtio-devices" } virtio-devices = { path = "../virtio-devices" }
virtio-queue = "0.13.0" virtio-queue = { workspace = true }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.15.0", features = [ vm-memory = { workspace = true, features = [
"backend-atomic", "backend-atomic",
"backend-bitmap", "backend-bitmap",
"backend-mmap", "backend-mmap",
] } ] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } vmm-sys-util = { workspace = true, features = ["with-serde"] }
zbus = { version = "4.1.2", optional = true } zbus = { version = "4.1.2", optional = true }
zerocopy = { version = "0.7.35", features = ["alloc", "derive"] } zerocopy = { version = "0.7.35", features = ["alloc", "derive"] }