Skip to content

Commit

Permalink
vmresources: json describe mmds-config
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Catangiu <acatan@amazon.com>
  • Loading branch information
acatangiu committed Jul 8, 2021
1 parent 21100e4 commit 468b6bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions src/vmm/src/resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,14 @@ impl VmResources {
.as_ref()
.map(BootSourceConfig::from)
.unwrap_or_default();

// TODO: go through net devices and check for mmds addr
let mmds_config: Option<MmdsConfig> = None;
let vmm_config = VmmConfig {
balloon_device: self.balloon.get_config().ok(),
block_devices: self.block.configs(),
boot_source,
logger: None,
machine_config: Some(self.vm_config.clone()),
metrics: None,
mmds_config,
mmds_config: self.mmds_config.clone(),
net_devices: self.net_builder.configs(),
vsock_device: self.vsock.config(),
};
Expand Down
2 changes: 1 addition & 1 deletion src/vmm/src/vmm_config/mmds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::fmt::{Display, Result};
use std::net::Ipv4Addr;

/// Keeps the MMDS configuration.
#[derive(Debug, Deserialize, PartialEq, Serialize)]
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct MmdsConfig {
/// MMDS IPv4 configured address.
Expand Down

0 comments on commit 468b6bd

Please sign in to comment.