diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index 31d491c9494..31d6179e8d9 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -131,11 +131,6 @@ public class KVMStoragePoolManager { return true; } - public boolean deleteVbdByPath(StoragePoolType type, String diskPath) { - StorageAdaptor adaptor = getStorageAdaptor(type); - return adaptor.deleteVbdByPath(diskPath); - } - public KVMPhysicalDisk createDiskFromTemplate(KVMPhysicalDisk template, String name, KVMStoragePool destPool) { StorageAdaptor adaptor = getStorageAdaptor(destPool.getType()); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index 28cfd42e05d..41df310c458 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -1147,22 +1147,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { return deleteStoragePool(pool.getUuid()); } - public boolean deleteVbdByPath(String diskPath) { - Connect conn; - try { - conn = LibvirtConnection.getConnection(); - StorageVol vol = conn.storageVolLookupByPath(diskPath); - if(vol != null) { - s_logger.debug("requested delete disk " + diskPath); - vol.delete(0); - } - } catch (LibvirtException e) { - s_logger.debug("Libvirt error in attempting to find and delete patch disk:" + e.toString()); - return false; - } - return true; - } - // refreshPool and deleteVol are used to fix CLOUDSTACK-2729/CLOUDSTACK-2780 // They are caused by a libvirt bug (https://bugzilla.redhat.com/show_bug.cgi?id=977706) // However, we also need to fix the issues in CloudStack source code. diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java index dd75677db20..4956d8d4717 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java @@ -61,6 +61,4 @@ public interface StorageAdaptor { public boolean createFolder(String uuid, String path); - public boolean deleteVbdByPath(String path); - }