kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: Simplify virtio device reset

Browse Source 
Rather than having to give and return the ioeventfd used for a device
clone them each time. This will make it simpler when we start handling
the driver enabling fewer queues than advertised by the device.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2021-01-18 12:38:08 +00:00
parent c99d3f70ac
commit 23f9ec50fb
16 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio-devices/src/transport/pci_device.rs
+14 -16
View File
@@ -659,13 +659,13 @@ impl VirtioPciDevice {
if self.memory.is_some() {
let mem = self.memory.as_ref().unwrap().clone();
let mut device = self.device.lock().unwrap();
let mut queue_evts = Vec::new();
let queues = self.queues.clone();
for i in 0..queues.len() {
queue_evts.push(self.queue_evts[i].try_clone().unwrap());
}
device
.activate(
mem,
virtio_interrupt,
self.queues.clone(),
self.queue_evts.split_off(0),
)
.activate(mem, virtio_interrupt, queues, queue_evts)
.expect("Failed to activate device");
self.device_activated.store(true, Ordering::SeqCst);
info!("{}: Waiting for barrier", self.id);
@@ -1032,11 +1032,9 @@ impl PciDevice for VirtioPciDevice {
// Device has been reset by the driver
if self.device_activated.load(Ordering::SeqCst) && self.is_driver_init() {
let mut device = self.device.lock().unwrap();
if let Some((virtio_interrupt, mut queue_evts)) = device.reset() {
// Upon reset the device returns its interrupt EventFD and it's queue EventFDs
if let Some(virtio_interrupt) = device.reset() {
// Upon reset the device returns its interrupt EventFD
self.virtio_interrupt = Some(virtio_interrupt);
self.queue_evts.append(&mut queue_evts);
self.device_activated.store(false, Ordering::SeqCst);
// Reset queue readiness (changes queue_enable), queue sizes
@@ -1162,13 +1160,13 @@ impl Snapshottable for VirtioPciDevice {
if self.memory.is_some() {
let mem = self.memory.as_ref().unwrap().clone();
let mut device = self.device.lock().unwrap();
let mut queue_evts = Vec::new();
let queues = self.queues.clone();
for i in 0..queues.len() {
queue_evts.push(self.queue_evts[i].try_clone().unwrap());
}
device
.activate(
mem,
virtio_interrupt,
self.queues.clone(),
self.queue_evts.split_off(0),
)
.activate(mem, virtio_interrupt, queues, queue_evts)
.map_err(|e| {
MigratableError::Restore(anyhow!(
"Failed activating the device: {:?}",