Skip to content

Commit 699f896

Browse files
committed
Remove detectVddkDir
1 parent 4417aab commit 699f896

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
368368
public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "rpm -qa | grep -i virtio-win";
369369
public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "dpkg -l virtio-win";
370370
public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";
371-
public static final String VDDK_AUTODETECT_PATH_CMD = "find / -type d -name 'vmware-vix-disklib-distrib' 2>/dev/null | head -n 1";
372371

373372
public static final int LIBVIRT_CGROUP_CPU_SHARES_MIN = 2;
374373
public static final int LIBVIRT_CGROUP_CPU_SHARES_MAX = 262144;
@@ -6009,9 +6008,6 @@ public boolean hostSupportsVddk(String overriddenVddkLibDir) {
60096008
if (StringUtils.isBlank(effectiveVddkLibDir)) {
60106009
effectiveVddkLibDir = StringUtils.trimToNull(vddkLibDir);
60116010
}
6012-
if (StringUtils.isBlank(effectiveVddkLibDir) || !isVddkLibDirValid(effectiveVddkLibDir)) {
6013-
effectiveVddkLibDir = detectVddkLibDir();
6014-
}
60156011
return hostSupportsInstanceConversion() && isVddkLibDirValid(effectiveVddkLibDir) && StringUtils.isNotBlank(detectVddkVersion());
60166012
}
60176013

@@ -6027,14 +6023,6 @@ protected boolean isVddkLibDirValid(String path) {
60276023
return libs != null && libs.length > 0;
60286024
}
60296025

6030-
protected String detectVddkLibDir() {
6031-
String detectedPath = StringUtils.trimToNull(Script.runSimpleBashScript(VDDK_AUTODETECT_PATH_CMD));
6032-
if (StringUtils.isNotBlank(detectedPath) && isVddkLibDirValid(detectedPath)) {
6033-
return detectedPath;
6034-
}
6035-
return null;
6036-
}
6037-
60386026
protected String detectVddkVersion() {
60396027
try {
60406028
ProcessBuilder pb = new ProcessBuilder("nbdkit", "vddk", "--version");

0 commit comments

Comments
 (0)