summary refs log tree commit diff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2018-10-05 11:40:59 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-10-12 23:07:16 -0700
commit56f283b297013a44e2f7d12c7a75e2267615c7f5 (patch)
tree57e35ee28119d718bb7b7c41f853d235b1ddcb96 /Cargo.lock
parented31137fd027dcc53321fd946c6ead5a1726cf05 (diff)
downloadcrosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar.gz
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar.bz2
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar.lz
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar.xz
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.tar.zst
crosvm-56f283b297013a44e2f7d12c7a75e2267615c7f5.zip
Revert "Revert "linux: Convert all virtio devices to PCI""
This reverts commit c8986f14a8dd9f256d6faed55996d955b50ff923.

Re-land the virtio PCI conversion after the preceding fixes.

BUG=chromium:854766
TEST=Boot crosvm on nami and kevin

Change-Id: I3699e3ed1a45cecc99c51e352d0cf0c32bc4116f
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1265862
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a7014e3..15720da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,6 +16,7 @@ dependencies = [
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "data_model 0.1.0",
  "devices 0.1.0",
+ "io_jail 0.1.0",
  "kernel_cmdline 0.1.0",
  "kvm 0.1.0",
  "kvm_sys 0.1.0",
@@ -459,6 +460,7 @@ dependencies = [
  "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "data_model 0.1.0",
  "devices 0.1.0",
+ "io_jail 0.1.0",
  "kernel_cmdline 0.1.0",
  "kernel_loader 0.1.0",
  "kvm 0.1.0",