From 7e0ab6b56d127f6af9877f474dbf5181d10dd201 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 27 Apr 2020 10:57:39 +0200
Subject: [PATCH] vmm: Fix pmem device creation

The parameters regarding the attachment to the virtio-iommu device was
not propagated correclty, and any modification to the configuration was
not stored back into it.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 vmm/src/device_manager.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index c0c727560..8cfc4e9d1 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -1621,7 +1621,7 @@ impl DeviceManager {
 
         Ok((
             Arc::clone(&virtio_pmem_device) as VirtioDeviceArc,
-            false,
+            pmem_cfg.iommu,
             pmem_cfg.id.clone(),
         ))
     }
@@ -1637,6 +1637,7 @@ impl DeviceManager {
                 devices.push(self.make_virtio_pmem_device(pmem_cfg)?);
             }
         }
+        self.config.lock().unwrap().pmem = pmem_devices;
 
         Ok(devices)
     }