From 465db7f08cadf0f229e31b7963ff0f58005d2c46 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Thu, 26 May 2022 13:13:54 +0100
Subject: [PATCH] vmm: config: Remove mergeable option from PmemConfig

Fixes: #3968

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 src/main.rs                               | 34 -----------------------
 vmm/src/api/openapi/cloud-hypervisor.yaml |  3 --
 vmm/src/config.rs                         | 16 +----------
 3 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3f0ab3b24..c77a7a0e0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1323,40 +1323,6 @@ mod unit_tests {
                 }"#,
                 false,
             ),
-            #[cfg(target_arch = "x86_64")]
-            (
-                vec![
-                    "cloud-hypervisor",
-                    "--kernel",
-                    "/path/to/kernel",
-                    "--pmem",
-                    "file=/path/to/img/1,size=1G,mergeable=on",
-                ],
-                r#"{
-                    "kernel": {"path": "/path/to/kernel"},
-                    "pmem": [
-                        {"file": "/path/to/img/1", "size": 1073741824, "mergeable": true}
-                    ]
-                }"#,
-                true,
-            ),
-            #[cfg(target_arch = "x86_64")]
-            (
-                vec![
-                    "cloud-hypervisor",
-                    "--kernel",
-                    "/path/to/kernel",
-                    "--pmem",
-                    "file=/path/to/img/1,size=1G,mergeable=off",
-                ],
-                r#"{
-                    "kernel": {"path": "/path/to/kernel"},
-                    "pmem": [
-                        {"file": "/path/to/img/1", "size": 1073741824, "mergeable": false}
-                    ]
-                }"#,
-                true,
-            ),
         ]
         .iter()
         .for_each(|(cli, openapi, equal)| {
diff --git a/vmm/src/api/openapi/cloud-hypervisor.yaml b/vmm/src/api/openapi/cloud-hypervisor.yaml
index 66e8c8a20..d3fbdbf14 100644
--- a/vmm/src/api/openapi/cloud-hypervisor.yaml
+++ b/vmm/src/api/openapi/cloud-hypervisor.yaml
@@ -905,9 +905,6 @@ components:
         iommu:
           type: boolean
           default: false
-        mergeable:
-          type: boolean
-          default: false
         discard_writes:
           type: boolean
           default: false
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index d3834d889..e3af173ec 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -1675,8 +1675,6 @@ pub struct PmemConfig {
     #[serde(default)]
     pub iommu: bool,
     #[serde(default)]
-    pub mergeable: bool,
-    #[serde(default)]
     pub discard_writes: bool,
     #[serde(default)]
     pub id: Option<String>,
@@ -1693,7 +1691,6 @@ impl PmemConfig {
         parser
             .add("size")
             .add("file")
-            .add("mergeable")
             .add("iommu")
             .add("discard_writes")
             .add("id")
@@ -1705,11 +1702,6 @@ impl PmemConfig {
             .convert::<ByteSized>("size")
             .map_err(Error::ParsePersistentMemory)?
             .map(|v| v.0);
-        let mergeable = parser
-            .convert::<Toggle>("mergeable")
-            .map_err(Error::ParsePersistentMemory)?
-            .unwrap_or(Toggle(false))
-            .0;
         let iommu = parser
             .convert::<Toggle>("iommu")
             .map_err(Error::ParsePersistentMemory)?
@@ -1730,7 +1722,6 @@ impl PmemConfig {
             file,
             size,
             iommu,
-            mergeable,
             discard_writes,
             id,
             pci_segment,
@@ -1738,10 +1729,6 @@ impl PmemConfig {
     }
 
     pub fn validate(&self, vm_config: &VmConfig) -> ValidationResult<()> {
-        if self.mergeable {
-            warn!("Enabling mergable pages for PMEM devices is ineffectual. This option is deprecated and will be removed in a later release");
-        }
-
         if let Some(platform_config) = vm_config.platform.as_ref() {
             if self.pci_segment >= platform_config.num_pci_segments {
                 return Err(ValidationError::InvalidPciSegment(self.pci_segment));
@@ -3094,11 +3081,10 @@ mod tests {
             }
         );
         assert_eq!(
-            PmemConfig::parse("file=/tmp/pmem,size=128M,iommu=on,mergeable=on,discard_writes=on")?,
+            PmemConfig::parse("file=/tmp/pmem,size=128M,iommu=on,discard_writes=on")?,
             PmemConfig {
                 file: PathBuf::from("/tmp/pmem"),
                 size: Some(128 << 20),
-                mergeable: true,
                 discard_writes: true,
                 iommu: true,
                 ..Default::default()