You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/27 09:42:26 UTC
[1/2] git commit: updated refs/heads/4.4 to 8f9458e
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 <sa...@citrix.com>
Authored: Thu Jun 26 15:28:03 2014 +0530
Committer: Daan Hoogland <da...@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);
[2/2] git commit: updated refs/heads/4.4 to 8f9458e
Posted by da...@apache.org.
CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different.
(cherry picked from commit 48646ae186eb75052da3da385404a823bd785444)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f9458e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f9458e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f9458e5
Branch: refs/heads/4.4
Commit: 8f9458e517fe6c5f3877cbe9a0dd6ec56f4c3adb
Parents: e0d7eb8
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Jun 27 11:53:07 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 27 09:41:52 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f9458e5/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index c4d5ae6..7b72f49 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1738,7 +1738,7 @@ public class ApiResponseHelper implements ResponseGenerator {
}
List<VgpuTypesInfo> gpuCapacities;
- if (!result.isEmpty() && (gpuCapacities = ApiDBUtils.getGpuCapacites(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId())) != null) {
+ if (result.size() > 1 && (gpuCapacities = ApiDBUtils.getGpuCapacites(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId())) != null) {
HashMap<String, Long> vgpuVMs = ApiDBUtils.getVgpuVmsCount(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId());
float capacityUsed = 0;