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: mem: Port to VirtioCommon for feature handling

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-09-03 10:37:36 +01:00
committed by Sebastien Boeuf
parent 47c165e08a
commit d63dcae233
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
virtio-devices/src/mem.rs
View File

@@ -15,8 +15,8 @@
use super::Error as DeviceError; use super::Error as DeviceError;
use super::{ use super::{
ActivateError, ActivateResult, DescriptorChain, EpollHelper, EpollHelperError, ActivateError, ActivateResult, DescriptorChain, EpollHelper, EpollHelperError,
EpollHelperHandler, Queue, VirtioDevice, VirtioDeviceType, EPOLL_HELPER_EVENT_LAST, EpollHelperHandler, Queue, VirtioCommon, VirtioDevice, VirtioDeviceType,
VIRTIO_F_VERSION_1, EPOLL_HELPER_EVENT_LAST, VIRTIO_F_VERSION_1,
}; };
use crate::seccomp_filters::{get_seccomp_filter, Thread}; use crate::seccomp_filters::{get_seccomp_filter, Thread};
@@ -680,12 +680,11 @@ impl EpollHelperHandler for MemEpollHandler {
// Virtio device for exposing entropy to the guest OS through virtio. // Virtio device for exposing entropy to the guest OS through virtio.
pub struct Mem { pub struct Mem {
common: VirtioCommon,
id: String, id: String,
resize: Resize, resize: Resize,
kill_evt: Option<EventFd>, kill_evt: Option<EventFd>,
pause_evt: Option<EventFd>, pause_evt: Option<EventFd>,
avail_features: u64,
pub acked_features: u64,
host_addr: u64, host_addr: u64,
host_fd: Option<RawFd>, host_fd: Option<RawFd>,
config: Arc<Mutex<VirtioMemConfig>>, config: Arc<Mutex<VirtioMemConfig>>,
@@ -737,12 +736,14 @@ impl Mem {
}; };
Ok(Mem { Ok(Mem {
common: VirtioCommon {
avail_features,
acked_features: 0u64,
},
id, id,
resize, resize,
kill_evt: None, kill_evt: None,
pause_evt: None, pause_evt: None,
avail_features,
acked_features: 0u64,
host_addr: region.as_ptr() as u64, host_addr: region.as_ptr() as u64,
host_fd, host_fd,
config: Arc::new(Mutex::new(config)), config: Arc::new(Mutex::new(config)),
@@ -775,20 +776,11 @@ impl VirtioDevice for Mem {
} }
fn features(&self) -> u64 { fn features(&self) -> u64 {
self.avail_features self.common.avail_features
} }
fn ack_features(&mut self, value: u64) { fn ack_features(&mut self, value: u64) {
let mut v = value; self.common.ack_features(value)
// Check if the guest is ACK'ing a feature that we didn't claim to have.
let unrequested_features = v & !self.avail_features;
if unrequested_features != 0 {
warn!("Received acknowledge request for unknown feature.");
// Don't count these features as acked.
v &= !unrequested_features;
}
self.acked_features |= v;
} }
fn read_config(&self, offset: u64, data: &mut [u8]) { fn read_config(&self, offset: u64, data: &mut [u8]) {