--- opennebula-4.4.0/src/vmm/LibVirtDriverKVM.cc	2013-11-28 04:43:24.000000000 +1200
+++ ../opennebula-4.4.0/src/vmm/LibVirtDriverKVM.cc	2013-12-07 23:12:47.066999935 +1200
@@ -361,10 +361,17 @@
                  << "\t\t\t<source dev='" << vm->get_remote_system_dir()
                  << "/disk." << disk_id << "'/>" << endl;
         }
-        else if ( type == "RBD" )
+        else if ( type == "RBD" || type == "RBD_CDROM")
         {
-            file << "\t\t<disk type='network' device='disk'>" << endl
-                 << "\t\t\t<source protocol='rbd' name='"
+            if ( type == "RBD" )
+            {
+                file << "\t\t<disk type='network' device='disk'>" << endl;
+            }
+            else 
+            {
+                file << "\t\t<disk type='network' device='cdrom'>" << endl;
+            }
+            file << "\t\t\t<source protocol='rbd' name='"
                  << source;
 
             if ( clone == "YES" )
@@ -413,19 +420,6 @@
                      << "\t\t\t</auth>" << endl;
             }
         }
-        else if ( type == "RBD_CDROM" )
-        {
-            file << "\t\t<disk type='network' device='cdrom'>" << endl
-                 << "\t\t\t<source protocol='rbd' name='"
-                 << source;
-
-            if ( clone == "YES" )
-            {
-                file << "-" << vm->get_oid() << "-" << disk_id;
-            }
-
-            file << "'/>" << endl;
-        }
         else if ( type == "CDROM" )
         {
             file << "\t\t<disk type='file' device='cdrom'>" << endl