summary refs log tree commit diff
path: root/devices/src/lib.rs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-31 23:40:22 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:35:49 +0000
commit3e6aa18b5564fd0190bb4618b14a5de5653b0731 (patch)
treee37bb8e15d26008ae192001289d2c450cf998d59 /devices/src/lib.rs
parentca5bdd2ac3e473e9b082c44c2870f446b96323a2 (diff)
downloadcrosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar.gz
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar.bz2
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar.lz
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar.xz
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.tar.zst
crosvm-3e6aa18b5564fd0190bb4618b14a5de5653b0731.zip
devices: don't jail in ProxyDevice constructor
Jail functionality has been moved into a new JailedDevice struct,
which wraps ProxyDevice.

Doing this allows ProxyDevice to be much more generic and reusable.
Diffstat (limited to 'devices/src/lib.rs')
-rw-r--r--devices/src/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/devices/src/lib.rs b/devices/src/lib.rs
index c945e00..294a8cb 100644
--- a/devices/src/lib.rs
+++ b/devices/src/lib.rs
@@ -9,6 +9,7 @@ mod cmos;
 mod i8042;
 mod ioapic;
 mod irqchip;
+mod jailed;
 mod pci;
 mod pic;
 mod pit;
@@ -32,6 +33,8 @@ pub use self::cmos::Cmos;
 pub use self::i8042::I8042Device;
 pub use self::ioapic::{Ioapic, IOAPIC_BASE_ADDRESS, IOAPIC_MEM_LENGTH_BYTES};
 pub use self::irqchip::*;
+pub use self::jailed::Error as ProxyError;
+pub use self::jailed::JailedDevice;
 pub use self::pci::{
     Ac97Backend, Ac97Dev, Ac97Parameters, PciAddress, PciConfigIo, PciConfigMmio, PciDevice,
     PciDeviceError, PciInterruptPin, PciRoot, VfioPciDevice,
@@ -39,8 +42,6 @@ pub use self::pci::{
 pub use self::pic::Pic;
 pub use self::pit::{Pit, PitError};
 pub use self::pl030::Pl030;
-pub use self::proxy::Error as ProxyError;
-pub use self::proxy::ProxyDevice;
 pub use self::serial::Serial;
 pub use self::serial_device::SerialDevice;
 pub use self::usb::host_backend::host_backend_device_provider::HostBackendDeviceProvider;