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

vm-virtio: Further factorization

Browse Source 
The trait bound and non trait bound virtio devices can use the same
inner implementation.
Also, the virtio pausable trait definiton can also be factorized.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz
2020-01-27 19:43:00 +01:00
committed by Sebastien Boeuf
parent bce76271c5
commit c4b3ed7223
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
vm-virtio/src/device.rs
View File

@@ -112,6 +112,15 @@ pub trait DmaRemapping: Send + Sync {
fn translate(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error>; fn translate(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error>;
} }
#[macro_export]
macro_rules! virtio_pausable_trait_definition {
() => {
trait VirtioPausable {
fn virtio_pause(&mut self) -> std::result::Result<(), MigratableError>;
fn virtio_resume(&mut self) -> std::result::Result<(), MigratableError>;
}
};
}
#[macro_export] #[macro_export]
macro_rules! virtio_pausable_trait_inner { macro_rules! virtio_pausable_trait_inner {
() => { () => {
@@ -151,10 +160,7 @@ macro_rules! virtio_pausable_trait_inner {
#[macro_export] #[macro_export]
macro_rules! virtio_pausable_trait { macro_rules! virtio_pausable_trait {
($type:ident) => { ($type:ident) => {
trait VirtioPausable { virtio_pausable_trait_definition!();
fn virtio_pause(&mut self) -> std::result::Result<(), MigratableError>;
fn virtio_resume(&mut self) -> std::result::Result<(), MigratableError>;
}
impl VirtioPausable for $type { impl VirtioPausable for $type {
virtio_pausable_trait_inner!(); virtio_pausable_trait_inner!();
@@ -162,10 +168,7 @@ macro_rules! virtio_pausable_trait {
}; };
($type:ident, T: $($bounds:tt)+) => { ($type:ident, T: $($bounds:tt)+) => {
trait VirtioPausable { virtio_pausable_trait_definition!();
fn virtio_pause(&mut self) -> std::result::Result<(), MigratableError>;
fn virtio_resume(&mut self) -> std::result::Result<(), MigratableError>;
}
impl<T: $($bounds)+ > VirtioPausable for $type<T> { impl<T: $($bounds)+ > VirtioPausable for $type<T> {
virtio_pausable_trait_inner!(); virtio_pausable_trait_inner!();
@@ -173,19 +176,26 @@ macro_rules! virtio_pausable_trait {
}; };
} }
#[macro_export]
macro_rules! virtio_pausable_inner {
($type:ident) => {
fn pause(&mut self) -> result::Result<(), MigratableError> {
self.virtio_pause()
}
fn resume(&mut self) -> result::Result<(), MigratableError> {
self.virtio_resume()
}
};
}
#[macro_export] #[macro_export]
macro_rules! virtio_pausable { macro_rules! virtio_pausable {
($type:ident) => { ($type:ident) => {
virtio_pausable_trait!($type); virtio_pausable_trait!($type);
impl Pausable for $type { impl Pausable for $type {
fn pause(&mut self) -> result::Result<(), MigratableError> { virtio_pausable_inner!($type);
self.virtio_pause()
}
fn resume(&mut self) -> result::Result<(), MigratableError> {
self.virtio_resume()
}
} }
}; };
@@ -194,13 +204,7 @@ macro_rules! virtio_pausable {
virtio_pausable_trait!($type, T: $($bounds)+); virtio_pausable_trait!($type, T: $($bounds)+);
impl<T: $($bounds)+ > Pausable for $type<T> { impl<T: $($bounds)+ > Pausable for $type<T> {
fn pause(&mut self) -> result::Result<(), MigratableError> { virtio_pausable_inner!($type);
self.virtio_pause()
}
fn resume(&mut self) -> result::Result<(), MigratableError> {
self.virtio_resume()
}
} }
}; };
} }