diff --git a/cloud-hypervisor/src/main.rs b/cloud-hypervisor/src/main.rs index bc7a0d12e..98a311ec4 100644 --- a/cloud-hypervisor/src/main.rs +++ b/cloud-hypervisor/src/main.rs @@ -1018,7 +1018,6 @@ mod unit_tests { mode: ConsoleOutputMode::Null, socket: None, }, - iommu: false, }, console: ConsoleConfig { common: CommonConsoleConfig { diff --git a/fuzz/fuzz_targets/http_api.rs b/fuzz/fuzz_targets/http_api.rs index 41246392f..ff94a1c56 100644 --- a/fuzz/fuzz_targets/http_api.rs +++ b/fuzz/fuzz_targets/http_api.rs @@ -177,7 +177,6 @@ impl RequestHandler for StubApiRequestHandler { mode: ConsoleOutputMode::Tty, socket: None, }, - iommu: false, }, console: ConsoleConfig { common: CommonConsoleConfig { diff --git a/vmm/src/config.rs b/vmm/src/config.rs index 217e07aaa..f008081e4 100644 --- a/vmm/src/config.rs +++ b/vmm/src/config.rs @@ -2207,18 +2207,11 @@ impl SerialConfig { let mut parser = OptionParser::new(); parser .add_all_valueless(CommonConsoleConfig::VALUELESS_OPTIONS) - .add_all(CommonConsoleConfig::VALUE_OPTIONS) - .add("iommu"); + .add_all(CommonConsoleConfig::VALUE_OPTIONS); parser.parse(serial).map_err(Error::ParseSerial)?; - let iommu = parser - .convert::("iommu") - .map_err(Error::ParsePciDeviceCommonConfig)? - .unwrap_or(Toggle(false)) - .0; - let common = CommonConsoleConfig::parse(serial, Error::ParseSerial)?; - Ok(Self { common, iommu }) + Ok(Self { common }) } } @@ -5054,7 +5047,6 @@ id=\"{id}\",pci_segment={pci_segment},queue_sizes={queue_sizes}" mode: ConsoleOutputMode::Null, socket: None, }, - iommu: false, }, console: ConsoleConfig { common: CommonConsoleConfig { diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs index eb996bc89..faa72fbeb 100644 --- a/vmm/src/lib.rs +++ b/vmm/src/lib.rs @@ -2729,7 +2729,6 @@ mod unit_tests { mode: ConsoleOutputMode::Null, socket: None, }, - iommu: false, }, console: ConsoleConfig { common: CommonConsoleConfig { diff --git a/vmm/src/vm_config.rs b/vmm/src/vm_config.rs index e6552f997..140311710 100644 --- a/vmm/src/vm_config.rs +++ b/vmm/src/vm_config.rs @@ -582,13 +582,10 @@ impl ApplyLandlock for CommonConsoleConfig { pub struct SerialConfig { #[serde(flatten)] pub common: CommonConsoleConfig, - #[serde(default, skip_serializing_if = "<&bool as std::ops::Not>::not")] - pub iommu: bool, } impl SerialConfig { - pub const SYNTAX: &str = - "Control serial port: \"off|null|pty|tty|file=|socket=,iommu=on|off\""; + pub const SYNTAX: &str = "Control serial port: \"off|null|pty|tty|file=|socket=\""; } impl Default for SerialConfig { @@ -599,7 +596,6 @@ impl Default for SerialConfig { mode: ConsoleOutputMode::Null, socket: None, }, - iommu: false, } } }