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 b8d6396
Date Thu, 30 Oct 2014 17:28:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 779cd60a7 -> b8d639640


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/b8d63964
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8d63964
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8d63964

Branch: refs/heads/master
Commit: b8d6396409d13e98f2df0d1d276956dd00bb049c
Parents: 779cd60
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Thu Oct 30 10:27:34 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Thu Oct 30 10:27:34 2014 -0700

----------------------------------------------------------------------
 .../resource/XenServerStorageProcessor.java     | 32 --------------------
 1 file changed, 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8d63964/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index 880f3e0..498bc3c 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -84,7 +84,6 @@ import com.xensource.xenapi.Types.XenAPIException;
 import com.xensource.xenapi.VBD;
 import com.xensource.xenapi.VDI;
 import com.xensource.xenapi.VM;
-import com.xensource.xenapi.VMGuestMetrics;
 
 public class XenServerStorageProcessor implements StorageProcessor {
     private static final Logger s_logger = Logger.getLogger(XenServerStorageProcessor.class);
@@ -269,22 +268,6 @@ public class XenServerStorageProcessor implements StorageProcessor {
                 vdi = hypervisorResource.mount(conn, null, null, data.getPath());
             }
 
-            /* For HVM guest, if no pv driver installed, no attach/detach */
-            boolean isHVM = vm.getPVBootloader(conn).equalsIgnoreCase("");
-
-            VMGuestMetrics vgm = vm.getGuestMetrics(conn);
-            boolean pvDrvInstalled = false;
-
-            if (!this.hypervisorResource.isRefNull(vgm) && vgm.getPVDriversUpToDate(conn))
{
-                pvDrvInstalled = true;
-            }
-
-            if (isHVM && !pvDrvInstalled) {
-                s_logger.warn(": You attempted an operation on a VM which requires PV drivers
to be installed but the drivers were not detected");
-
-                return new AttachAnswer("You attempted an operation that requires PV drivers
to be installed on the VM. Please install them by inserting xen-pv-drv.iso.");
-            }
-
             // Figure out the disk number to attach the VM to
             String diskNumber = null;
             Long deviceId = disk.getDiskSeq();
@@ -432,21 +415,6 @@ public class XenServerStorageProcessor implements StorageProcessor {
             }
 
             if (!vmNotRunning) {
-                /* For HVM guest, if no pv driver installed, no attach/detach */
-                boolean isHVM = vm.getPVBootloader(conn).equalsIgnoreCase("");
-
-                VMGuestMetrics vgm = vm.getGuestMetrics(conn);
-                boolean pvDrvInstalled = false;
-
-                if (!this.hypervisorResource.isRefNull(vgm) && vgm.getPVDriversUpToDate(conn))
{
-                    pvDrvInstalled = true;
-                }
-
-                if (isHVM && !pvDrvInstalled) {
-                    s_logger.warn(": You attempted an operation on a VM which requires PV
drivers to be installed but the drivers were not detected");
-                    return new DettachAnswer("You attempted an operation that requires PV
drivers to be installed on the VM. Please install them by inserting xen-pv-drv.iso.");
-                }
-
                 VDI vdi = this.hypervisorResource.mount(conn, null, null, data.getPath());
 
                 // Look up all VBDs for this VDI


Mime
View raw message