cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 45611a0
Date Tue, 21 Oct 2014 18:15:01 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master fbe205b9d -> 45611a0f8


don't need to check if pv driver is updated, old pv driver should work


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45611a0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45611a0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45611a0f

Branch: refs/heads/master
Commit: 45611a0f83024d055adcce0d05b5fcfb567e329b
Parents: fbe205b
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Tue Oct 21 11:14:15 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Tue Oct 21 11:14:15 2014 -0700

----------------------------------------------------------------------
 .../xenserver/resource/CitrixResourceBase.java    | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45611a0f/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 6f3a21e..1412b17 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -80,7 +80,6 @@ import com.xensource.xenapi.VGPU;
 import com.xensource.xenapi.VIF;
 import com.xensource.xenapi.VLAN;
 import com.xensource.xenapi.VM;
-import com.xensource.xenapi.VMGuestMetrics;
 import com.xensource.xenapi.XenAPIObject;
 
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
@@ -6139,23 +6138,6 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
 
             // Look up the VM
             VM vm = getVM(conn, vmName);
-            /* For HVM guest, if no pv driver installed, no attach/detach */
-            boolean isHVM;
-            if (vm.getPVBootloader(conn).equalsIgnoreCase("")) {
-                isHVM = true;
-            } else {
-                isHVM = false;
-            }
-            VMGuestMetrics vgm = vm.getGuestMetrics(conn);
-            boolean pvDrvInstalled = false;
-            if (!isRefNull(vgm) && vgm.getPVDriversUpToDate(conn)) {
-                pvDrvInstalled = true;
-            }
-            if (isHVM && !pvDrvInstalled) {
-                s_logger.warn(errorMsg + ": You attempted an operation on a VM which requires
PV drivers to be installed but the drivers were not detected");
-                return new AttachVolumeAnswer(cmd,
-                        "You attempted an operation that requires PV drivers to be installed
on the VM. Please install them by inserting xen-pv-drv.iso.");
-            }
             if (attach) {
                 // Figure out the disk number to attach the VM to
                 String diskNumber = null;


Mime
View raw message