diff options
| author | Miriam Zimmerman <mutexlox@google.com> | 2019-03-15 16:54:25 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-20 08:52:41 -0700 |
| commit | 63e3a83a37fe62fd0189a08ac178b7c2b74b91cb (patch) | |
| tree | 0cd9703f530dd2394ca3e5c4150f37940e9554bb | |
| parent | 7e622edd00393dbd018f6d20039f8abfa945a287 (diff) | |
| download | crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar.gz crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar.bz2 crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar.lz crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar.xz crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.tar.zst crosvm-63e3a83a37fe62fd0189a08ac178b7c2b74b91cb.zip | |
Move split_irqchip_common to devices/.
Previously, code in devices/ couldn't use split_irqchip_common, since x86_64/ already has a dependency on devices/. TEST=Built. BUG=chromium:908689 Change-Id: I481514ae6bbd68e47feecc6f364ca8f4fd798e67 Reviewed-on: https://chromium-review.googlesource.com/1526762 Commit-Ready: Miriam Zimmerman <mutexlox@chromium.org> Tested-by: Miriam Zimmerman <mutexlox@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: David Tolnay <dtolnay@chromium.org>
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | devices/src/lib.rs | 1 | ||||
| -rw-r--r-- | devices/src/split_irqchip_common.rs (renamed from x86_64/src/split_irqchip_common.rs) | 0 | ||||
| -rw-r--r-- | x86_64/Cargo.toml | 1 | ||||
| -rw-r--r-- | x86_64/src/lib.rs | 3 |
5 files changed, 1 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1014fe9..b6a1360 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -548,7 +548,6 @@ name = "x86_64" version = "0.1.0" dependencies = [ "arch 0.1.0", - "bit_field 0.1.0", "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "data_model 0.1.0", diff --git a/devices/src/lib.rs b/devices/src/lib.rs index dae8d3f..07b61c5 100644 --- a/devices/src/lib.rs +++ b/devices/src/lib.rs @@ -39,6 +39,7 @@ mod proxy; #[macro_use] mod register_space; mod serial; +pub mod split_irqchip_common; pub mod usb; mod utils; pub mod virtio; diff --git a/x86_64/src/split_irqchip_common.rs b/devices/src/split_irqchip_common.rs index 6a722e2..6a722e2 100644 --- a/x86_64/src/split_irqchip_common.rs +++ b/devices/src/split_irqchip_common.rs diff --git a/x86_64/Cargo.toml b/x86_64/Cargo.toml index 47a281c..521573b 100644 --- a/x86_64/Cargo.toml +++ b/x86_64/Cargo.toml @@ -6,7 +6,6 @@ build = "build.rs" [dependencies] arch = { path = "../arch" } -bit_field = { path = "../bit_field" } data_model = { path = "../data_model" } devices = { path = "../devices" } io_jail = { path = "../io_jail" } diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs index 0f3c757..4ca7c2e 100644 --- a/x86_64/src/lib.rs +++ b/x86_64/src/lib.rs @@ -3,7 +3,6 @@ // found in the LICENSE file. extern crate arch; -extern crate bit_field; extern crate byteorder; extern crate data_model; extern crate devices; @@ -66,9 +65,7 @@ mod gdt; mod interrupts; mod mptable; mod regs; -mod split_irqchip_common; -pub use self::split_irqchip_common::*; use std::error::Error as StdError; use std::ffi::{CStr, CString}; use std::fmt::{self, Display}; |