cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [19/20] git commit: updated refs/heads/4.5 to 64e938b
Date Mon, 02 Feb 2015 10:17:17 GMT
don't need to check if pv driver is updated, old pv driver should work

(cherry picked from commit 45611a0f83024d055adcce0d05b5fcfb567e329b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.5
Commit: 86fe713ab9ca40f0be1b0d6a8142352a54dc6079
Parents: bf7013f
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Tue Oct 21 11:14:15 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Feb 2 15:02:31 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86fe713a/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 ee4e3d5..ef1a950 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;
@@ -6148,23 +6147,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