cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/4.4 to 8f9458e
Date Fri, 27 Jun 2014 07:42:26 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 1dbcf8f45 -> 8f9458e51


CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU offering is not coming
up after installing PV drivers.

(cherry picked from commit dc22566c642e400014332045a224e5545d33a11c)


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

Branch: refs/heads/4.4
Commit: e0d7eb8fc0a2445589fbbf7f3404f4536722076e
Parents: 1dbcf8f
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Thu Jun 26 15:28:03 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Jun 27 09:30:06 2014 +0200

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0d7eb8f/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index fecd361..9e34b63 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1445,7 +1445,7 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                 }
             }
             String xentoolsversion = details.get("hypervisortoolsversion");
-            if (xentoolsversion == null || !xentoolsversion.equalsIgnoreCase("xenserver61"))
{
+            if ((xentoolsversion == null || !xentoolsversion.equalsIgnoreCase("xenserver61"))
&& vmSpec.getGpuDevice() == null) {
                 Map<String, String> platform = vm.getPlatform(conn);
                 platform.remove("device_id");
                 vm.setPlatform(conn, platform);


Mime
View raw message