diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2019-12-17 17:04:58 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-06 21:26:38 +0000 |
| commit | f2eecc4152eca8d395566cffa2c102ec090a152d (patch) | |
| tree | 9480039e894cdfc3eb47e7953d225d47323981d5 /fuzz | |
| parent | 521cf5d6d3faad12671ba0f7eb5d6ed85fc20693 (diff) | |
| download | crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar.gz crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar.bz2 crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar.lz crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar.xz crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.tar.zst crosvm-f2eecc4152eca8d395566cffa2c102ec090a152d.zip | |
disk: move qcow into disk crate
Move qcow from being its own crate into a module of the disk crate, similar to the composite disk module. This will allow use of qcow from disk and vice versa without introducing a circular crate dependency. BUG=None TEST=./build_test.py TEST=USE='asan fuzzer' emerge-nami crosvm Change-Id: I77512bbe4b94faff1b5460f9796ee56505135580 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1972477 Reviewed-by: Cody Schuffelen <schuffelen@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/Cargo.toml | 2 | ||||
| -rw-r--r-- | fuzz/qcow_fuzzer.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 47d3bf2..1616921 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" cros_fuzz = "*" data_model = { path = "../data_model" } devices = { path = "../devices" } +disk = { path = "../disk" } kernel_loader = { path = "../kernel_loader" } libc = "*" -qcow = { path = "../qcow" } rand = "0.6" sys_util = { path = "../sys_util" } usb_util = { path = "../usb_util" } diff --git a/fuzz/qcow_fuzzer.rs b/fuzz/qcow_fuzzer.rs index 74bc75f..c8d1b38 100644 --- a/fuzz/qcow_fuzzer.rs +++ b/fuzz/qcow_fuzzer.rs @@ -5,7 +5,7 @@ #![no_main] use cros_fuzz::fuzz_target; -use qcow::QcowFile; +use disk::QcowFile; use sys_util::SharedMemory; use std::fs::File; |