From 4abf3c88f45f18989671c4794fd453ba08cd4e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.systems>
Date: Tue, 19 Nov 2019 12:39:20 +0100
Subject: [PATCH] B #3949: Fix error when attaching a disk to a VM using hybrid
 mode (#3955)

---
 src/vm/VirtualMachineDisk.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vm/VirtualMachineDisk.cc b/src/vm/VirtualMachineDisk.cc
index 06c79843b9..559a080bf2 100644
--- a/src/vm/VirtualMachineDisk.cc
+++ b/src/vm/VirtualMachineDisk.cc
@@ -1111,6 +1111,15 @@ VirtualMachineDisk * VirtualMachineDisks::set_up_attach(int vmid, int uid,
 
     VirtualMachineDisk * disk = new VirtualMachineDisk(vdisk, max_disk_id + 1);
 
+    if ( !tsys.empty() )
+    {
+        disk->replace("TM_MAD_SYSTEM", tsys);
+    }
+    else
+    {
+        disk->remove("TM_MAD_SYSTEM");
+    }
+
     int rc = ipool->acquire_disk(vmid, disk, max_disk_id + 1, img_type,
                          dev_prefix, uid, image_id, &snap, true, error);
     if ( rc != 0 )
@@ -1175,15 +1184,6 @@ VirtualMachineDisk * VirtualMachineDisks::set_up_attach(int vmid, int uid,
 
     disk->set_attach();
 
-    if ( !tsys.empty() )
-    {
-        disk->replace("TM_MAD_SYSTEM", tsys);
-    }
-    else
-    {
-        disk->remove("TM_MAD_SYSTEM");
-    }
-
     add_attribute(disk, disk->get_disk_id());
 
     return disk;