External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: pci_device: Split out device activation

Browse Source 
This can then be used to activate the device from a separate thread.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-11-09 12:51:45 +00:00
parent 7cc729c7d9
commit dee42ebb29
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
virtio-devices/src/transport/pci_device.rs
View File

@ -641,6 +641,30 @@ impl VirtioPciDevice {
pub fn virtio_device(&self) -> Arc<Mutex<dyn VirtioDevice>> {
self.device.clone()
}
pub fn maybe_activate(&mut self) {
if self.needs_activation() {
if let Some(virtio_interrupt) = self.virtio_interrupt.take() {
if self.memory.is_some() {
let mem = self.memory.as_ref().unwrap().clone();
let mut device = self.device.lock().unwrap();
device
.activate(
mem,
virtio_interrupt,
self.queues.clone(),
self.queue_evts.split_off(0),
)
.expect("Failed to activate device");
self.device_activated = true;
}
}
}
}
fn needs_activation(&self) -> bool {
!self.device_activated && self.is_driver_ready() && self.are_queues_valid()
}
}
impl VirtioTransport for VirtioPciDevice {
@ -976,23 +1000,8 @@ impl PciDevice for VirtioPciDevice {
_ => (),
};
if !self.device_activated && self.is_driver_ready() && self.are_queues_valid() {
if let Some(virtio_interrupt) = self.virtio_interrupt.take() {
if self.memory.is_some() {
let mem = self.memory.as_ref().unwrap().clone();
let mut device = self.device.lock().unwrap();
device
.activate(
mem,
virtio_interrupt,
self.queues.clone(),
self.queue_evts.split_off(0),
)
.expect("Failed to activate device");
self.device_activated = true;
}
}
}
// Try and activate the device if the driver status has changed
self.maybe_activate();
// Device has been reset by the driver
if self.device_activated && self.is_driver_init() {