mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
vmm: Propagate the SeccompAction value to the Vm struct constructor
This patch propagates the SeccompAction value from main to the Vm struct constructor (i.e. Vm::new_from_memory_manager), so that we can use it to construct the DeviceManager and CpuManager struct for controlling the behavior of the seccomp filters for vcpu/virtio-device worker threads. Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
@@ -45,6 +45,7 @@ use linux_loader::loader::elf::Error::InvalidElfMagicNumber;
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
use linux_loader::loader::elf::PvhBootCapability::PvhEntryPresent;
|
||||
use linux_loader::loader::KernelLoader;
|
||||
use seccomp::SeccompAction;
|
||||
use signal_hook::{iterator::Signals, SIGINT, SIGTERM, SIGWINCH};
|
||||
use std::collections::HashMap;
|
||||
use std::convert::TryInto;
|
||||
@@ -267,6 +268,7 @@ impl Vm {
|
||||
exit_evt: EventFd,
|
||||
reset_evt: EventFd,
|
||||
vmm_path: PathBuf,
|
||||
_seccomp_action: &SeccompAction,
|
||||
hypervisor: Arc<dyn hypervisor::Hypervisor>,
|
||||
_saved_clock: Option<hypervisor::ClockData>,
|
||||
) -> Result<Self> {
|
||||
@@ -332,6 +334,7 @@ impl Vm {
|
||||
exit_evt: EventFd,
|
||||
reset_evt: EventFd,
|
||||
vmm_path: PathBuf,
|
||||
seccomp_action: &SeccompAction,
|
||||
hypervisor: Arc<dyn hypervisor::Hypervisor>,
|
||||
) -> Result<Self> {
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
@@ -365,6 +368,7 @@ impl Vm {
|
||||
exit_evt,
|
||||
reset_evt,
|
||||
vmm_path,
|
||||
seccomp_action,
|
||||
hypervisor,
|
||||
None,
|
||||
)?;
|
||||
@@ -381,6 +385,7 @@ impl Vm {
|
||||
Ok(new_vm)
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new_from_snapshot(
|
||||
snapshot: &Snapshot,
|
||||
exit_evt: EventFd,
|
||||
@@ -388,6 +393,7 @@ impl Vm {
|
||||
vmm_path: PathBuf,
|
||||
source_url: &str,
|
||||
prefault: bool,
|
||||
seccomp_action: &SeccompAction,
|
||||
hypervisor: Arc<dyn hypervisor::Hypervisor>,
|
||||
) -> Result<Self> {
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
@@ -422,6 +428,7 @@ impl Vm {
|
||||
exit_evt,
|
||||
reset_evt,
|
||||
vmm_path,
|
||||
seccomp_action,
|
||||
hypervisor,
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
vm_snapshot.clock,
|
||||
|
||||
Reference in New Issue
Block a user