mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/disk/Cargo.toml

37 lines
929 B
TOML
Raw Normal View History

Extract disk creation logic out of qcow and src. Bug: b/133432409 Change-Id: Iba25d5f6bb5f60619bb2f5a3d72ddfd3a81650b4 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691460 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-02 23:54:05 +00:00
[package]
name = "disk"
version = "0.1.0"
Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
crosvm: migrate to Rust 2021 edition BUG=none TEST=cq Change-Id: I0059c970879b78bfd40b6ce58b10debcf154b50f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3508322 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Anton Romanov <romanton@google.com>
2022-03-08 01:16:09 +00:00
edition = "2021"
Extract disk creation logic out of qcow and src. Bug: b/133432409 Change-Id: Iba25d5f6bb5f60619bb2f5a3d72ddfd3a81650b4 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691460 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-02 23:54:05 +00:00
[lib]
path = "src/disk.rs"
Support composite disks. This adds a new disk file type next to raw files and qcow images that represent an indirection to further raw disk files. The disk file itself is a proto file with references to file paths for other disks to open and their virtual offsets and lengths. The intention is to make it easy to assemble a single virtual hard disk out of several distinct partition files. In the particular case of Cuttlefish running Android in a VM, this is relevant as the Android build system distributes partitions as separate raw files. While the simple solution is to pass each partition as a separate raw disk, some functionality (like the bootloader) assumes there is a partition table with multiple distinct partitions on a single disk. Implementing composite disk support in the VMM bridges this gap through supporting the general-purpose case of a disk built out of multiple component files. If desired, this can be extended to support qcow files to support unusual configurations like a mixed qcow/raw disk. Enabled with the "composite-disk" feature. Bug: b/133432409 Change-Id: I2b0c47d92fab13b5dc0ca5a960c7cfd2b7145b87 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1667767 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-08 23:14:24 +00:00
[features]
disk: Turn Android Sparse format into a feature This is a follow-up to https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3864926, which implements this for QCOW. Same rationale: allow to turn off support for disk formats that projects do not need/want. BUG=None TEST=./tools/presubmit; cd crosvm-fuzz && cargo build Change-Id: I401bad4d4ccb1a00a303ed86f1156f153b70b562 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3872278 Commit-Queue: Christian Blichmann <cblichmann@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Tested-by: Christian Blichmann <cblichmann@google.com>
2022-09-05 12:29:55 +00:00
android-sparse = []
Add methods to create composite disk image. This can be used like: crosvm create_composite composite.img partiton1:partition1.img partition2:partition2.img BUG=b:190503456 TEST=cargo test Cq-Depend: chromium:2982777, chromium:3008399 Change-Id: I31a9afe1e5f1e2a850ce1f892122150bcf3441b4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2972869 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org> Auto-Submit: Andrew Walbran <qwandor@google.com>
2021-06-17 17:12:14 +00:00
composite-disk = ["crc32fast", "protos", "protobuf", "uuid"]
qcow: Turn QCOW support into a feature This change allows to turn off support for QCOW. This is useful for projects that do not need/want it. A follow-up change (if this one is merged) will do the same for Android sparse disk images. BUG=none TEST=./tools/presubmit Change-Id: I69083c4c2e21d504db89eff47f4c86c6f61d67e9 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3864926 Tested-by: Christian Blichmann <cblichmann@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Christian Blichmann <cblichmann@google.com>
2022-08-31 13:30:11 +00:00
qcow = []
Support composite disks. This adds a new disk file type next to raw files and qcow images that represent an indirection to further raw disk files. The disk file itself is a proto file with references to file paths for other disks to open and their virtual offsets and lengths. The intention is to make it easy to assemble a single virtual hard disk out of several distinct partition files. In the particular case of Cuttlefish running Android in a VM, this is relevant as the Android build system distributes partitions as separate raw files. While the simple solution is to pass each partition as a separate raw disk, some functionality (like the bootloader) assumes there is a partition table with multiple distinct partitions on a single disk. Implementing composite disk support in the VMM bridges this gap through supporting the general-purpose case of a disk built out of multiple component files. If desired, this can be extended to support qcow files to support unusual configurations like a mixed qcow/raw disk. Enabled with the "composite-disk" feature. Bug: b/133432409 Change-Id: I2b0c47d92fab13b5dc0ca5a960c7cfd2b7145b87 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1667767 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-08 23:14:24 +00:00
Extract disk creation logic out of qcow and src. Bug: b/133432409 Change-Id: Iba25d5f6bb5f60619bb2f5a3d72ddfd3a81650b4 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691460 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-02 23:54:05 +00:00
[dependencies]
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
async-trait = "*"
Refactoring: Move common/base into base Executes the script in https://crrev.com/c/3530502 BUG=b:223206469 TEST=presubmit Change-Id: Ibeffdc8de0b2270f070e60bb2de8d9fdc78a2a6d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3530503 Reviewed-by: Vikram Auradkar <auradkar@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2022-03-16 19:16:04 +00:00
base = { path = "../base" }
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
cfg-if = "1.0.0"
Add methods to create composite disk image. This can be used like: crosvm create_composite composite.img partiton1:partition1.img partition2:partition2.img BUG=b:190503456 TEST=cargo test Cq-Depend: chromium:2982777, chromium:3008399 Change-Id: I31a9afe1e5f1e2a850ce1f892122150bcf3441b4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2972869 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org> Auto-Submit: Andrew Walbran <qwandor@google.com>
2021-06-17 17:12:14 +00:00
crc32fast = { version = "1.2.1", optional = true }
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
cros_async = { path = "../cros_async" }
data_model = { path = "../common/data_model" }
Extract disk creation logic out of qcow and src. Bug: b/133432409 Change-Id: Iba25d5f6bb5f60619bb2f5a3d72ddfd3a81650b4 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691460 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-02 23:54:05 +00:00
libc = "*"
Cargo.toml: upgrade protobuf 2.x -> 3.x system_api bindings have been regenerated with protobuf 3.2; this should be okay to land before the full ChromeOS system_api migration, since crosvm always uses its own copy of the bindings rather than the ones provided by the dev-rust/system_api package. The protoc-rust crate is replaced with protobuf_codegen in 3.x. BUG=b:277243607 BUG=b:279834784 TEST=tools/dev_container tools/presubmit Change-Id: I6aad45ded2639d7506a7238800584bebab196455 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4405309 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2023-04-06 19:45:32 +00:00
protobuf = { version = "3.2", optional = true }
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
protos = { path = "../protos", features = ["composite-disk"], optional = true }
Extract disk creation logic out of qcow and src. Bug: b/133432409 Change-Id: Iba25d5f6bb5f60619bb2f5a3d72ddfd3a81650b4 Signed-off-by: Cody Schuffelen <schuffelen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691460 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
2019-07-02 23:54:05 +00:00
remain = "*"
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
serde = { version = "1", features = [ "derive" ] }
disk: add AsyncDiskFileWrapper As a stepping stone toward fully asynchronous disk formats, add a wrapper that takes a regular synchronous DiskFile and provides the async disk API. BUG=b:219595052 TEST=cargo build --features=composite-disk Change-Id: Id785ad7ff69ae869a8a9007134fdb4fe7f3be4ba Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3824066 Tested-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2022-05-13 20:27:00 +00:00
sync = { path = "../common/sync" }
disk: Switch to ThisError `ThisError` is now used as the standard across crosvm Change-Id: I5e888c3af0bf98d6d00487ce48c92c929571bd6d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2947799 Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Dylan Reid <dgreid@chromium.org>
2021-06-08 19:11:24 +00:00
thiserror = "*"
disk: upstream windows support Splits out unix/windows code in to sys & adds windows code. TEST=builds BUG=b:213150316 Change-Id: I1dcc63ae978a5d72ee51b916181317b8f7008dbe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3654613 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-05-18 23:14:56 +00:00
tempfile = "3"
crosvm: Uprev uuid > 1 Uprev to version available in Debian. This seem to end up doing uprev to 1.3 now. BUG=b:265082456 BUG=b:229895468 TEST=build Change-Id: I550778acb675c9034b9cfcea77f4ae847e2d2ea1 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4364559 Commit-Queue: Junichi Uekawa <uekawa@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Auto-Submit: Junichi Uekawa <uekawa@chromium.org> Reviewed-by: Frederick Mayle <fmayle@google.com>
2023-02-03 01:53:53 +00:00
uuid = { version = "1", features = ["v4"], optional = true }
disk: Add Asyncdisk Trait The AsyncDisk Trait will be used by block to issue asynchronous operations on kernels that support async IO. TEST=Added unit tests Cq-Depend: chromium:2265040 Change-Id: I83adb83df278c4d19ac5dd4e5b91fb5bf96d4e89 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2306785 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Dylan Reid <dgreid@chromium.org>
2020-06-27 00:54:02 +00:00
vm_memory = { path = "../vm_memory" }
crosvm: Uprev zerocopy to 0.7.x zerocopy 0.7.x has finally released as a stable version, uprev it to allow some remaining structs to be derivable. TEST=CQ BUG=b:300969352 FIXED=b:300969352 Change-Id: I90f0dfb09494f875fef1cd11bfcbd48030846092 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4878761 Auto-Submit: Zihan Chen <zihanchen@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Zihan Chen <zihanchen@google.com>
2023-09-20 19:11:35 +00:00
zerocopy = { version = "0.7", features = ["derive"] }
disk: Add Asyncdisk Trait The AsyncDisk Trait will be used by block to issue asynchronous operations on kernels that support async IO. TEST=Added unit tests Cq-Depend: chromium:2265040 Change-Id: I83adb83df278c4d19ac5dd4e5b91fb5bf96d4e89 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2306785 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Dylan Reid <dgreid@chromium.org>
2020-06-27 00:54:02 +00:00
[dependencies.futures]
version = "*"
default-features = false
Reference in a new issue Copy permalink