bug

diff --git a/karesansui/lib/const.py b/karesansui/lib/const.py
index 400af9a..aecd5f3 100644 (file)
--- a/karesansui/lib/const.py
+++ b/karesansui/lib/const.py
@@ -260,12 +260,12 @@ STORAGE_POOL_TYPE = {"TYPE_DIR":"dir",
 
 STORAGE_VOLUME_FORMAT = {"TYPE_RAW":"raw",
                   "TYPE_QCOW2":"qcow2",
-                  "TYPE_QCOW":"qcow",
-                  "TYPE_COW":"cow",
-                  "TYPE_VDI":"vdi",
-                  "TYPE_VMDK":"vmdk",
-                  "TYPE_VPC":"vpc",
-                  "TYPE_CLOOP":"cloop",
+                  #"TYPE_QCOW":"qcow",
+                  #"TYPE_COW":"cow",
+                  #"TYPE_VDI":"vdi",
+                  #"TYPE_VMDK":"vmdk",
+                  #"TYPE_VPC":"vpc",
+                  #"TYPE_CLOOP":"cloop",
                   }
 
 STORAGE_VOLUME_UNIT = {"B":1024**0,
@@ -280,9 +280,9 @@ STORAGE_VOLUME_UNIT = {"B":1024**0,
 # Disk format
 DISK_QEMU_FORMAT = {"RAW" : "raw",
                     "QCOW2" : "qcow2",
-                    "QCOW" : "qcow",
-                    "COW" : "cow",
-                    "VMDK" : "vmdk",
+                    #"QCOW" : "qcow",
+                    #"COW" : "cow",
+                    #"VMDK" : "vmdk",
                     }
 
 DISK_NON_QEMU_FORMAT = {"RAW" : "raw",}
@@ -501,7 +501,10 @@ LOG_VIEW_XML_FILE = KARESANSUI_SYSCONF_DIR + "/logview.xml"
 
 GUEST_EXPORT_FILE = 'info.dat'
 
-KVM_BUS_TYPES = ['ide','scsi','virtio']
+KVM_BUS_TYPES = ['ide',
+                 #'scsi',
+                 'virtio',
+                 ]
 XEN_BUS_TYPES = ['xen']
 
 # use for mount check

diff --git a/karesansui/lib/virt/virt.py b/karesansui/lib/virt/virt.py
index e6ba868..be55098 100644 (file)
--- a/karesansui/lib/virt/virt.py
+++ b/karesansui/lib/virt/virt.py
@@ -950,11 +950,15 @@ class KaresansuiVirtConnection:
         else:
             vol_path = "%s/%s" % (domains_dir, volume)
 
-        self.destroy_guest(name)
+        try:
+            self.destroy_guest(name)
+        except libvirt.libvirtError, e:
+            self.logger.info("Could not remove the guest. - name=%s" % name)
+
         try:
             self.guest.undefine()
         except:
-            pass
+            self.logger.info("Guests definition could not be removed. - name=%s" % name)
 
         import shutil
         if os.path.islink(vol_path):