brl/pH
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow direct access to ioevent and next chain of virtqueue

Browse Source
This commit is contained in:
Bruce Leidl 2019-09-11 15:54:32 -04:00
parent 07d1c765d4
commit f893d5a316
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rust/src/virtio/virtqueue.rs
View File

@ -1,5 +1,6 @@
use std::sync::atomic::{Ordering, AtomicUsize, AtomicBool}; use std::sync::atomic::{Ordering, AtomicUsize, AtomicBool};
use std::sync::Arc; use std::sync::Arc;
use std::os::unix::io::AsRawFd;
use crate::memory::GuestRam; use crate::memory::GuestRam;
use crate::kvm::Kvm; use crate::kvm::Kvm;
@ -64,6 +65,11 @@ impl VirtQueue {
} }
} }
pub fn next_chain(&self) -> Option<Chain> {
self.pop_avail_entry()
.map(|idx| Chain::new(self.memory.clone(), self.clone(), idx, self.vring.size()))
}
pub fn on_each_chain<F>(&self, mut f: F) pub fn on_each_chain<F>(&self, mut f: F)
where F: FnMut(Chain) { where F: FnMut(Chain) {
loop { loop {
@ -112,6 +118,10 @@ impl VirtQueue {
pub fn load_descriptor(&self, idx: u16) -> Option<Descriptor> { pub fn load_descriptor(&self, idx: u16) -> Option<Descriptor> {
self.vring.load_descriptor(idx) self.vring.load_descriptor(idx)
} }
pub fn ioevent(&self) -> &IoEventFd {
&self.ioeventfd
}
} }
pub struct QueueIter { pub struct QueueIter {
@ -141,7 +151,7 @@ impl InterruptLine {
fn new(kvm: &Kvm, irq: u8) -> Result<Arc<InterruptLine>> { fn new(kvm: &Kvm, irq: u8) -> Result<Arc<InterruptLine>> {
let irqfd = EventFd::new()?; let irqfd = EventFd::new()?;
kvm.irqfd(irqfd.raw_fd() as u32, irq as u32)?; kvm.irqfd(irqfd.as_raw_fd() as u32, irq as u32)?;
Ok(Arc::new(InterruptLine{ Ok(Arc::new(InterruptLine{
irqfd, irqfd,
isr: AtomicUsize::new(0) isr: AtomicUsize::new(0)