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 fcf2c1b
Date Tue, 09 Sep 2014 21:39:17 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 765659091 -> fcf2c1b6b


CLOUDSTACK-7505:

  if VM is created from ISO, don't change platform metadat for VM on XS


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

Branch: refs/heads/master
Commit: fcf2c1b6bc08037cca9952d5c97490c74e29876b
Parents: 7656590
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Tue Sep 9 14:01:23 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Tue Sep 9 14:02:37 2014 -0700

----------------------------------------------------------------------
 .../xenserver/resource/CitrixResourceBase.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fcf2c1b6/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 7e386a3..b12dc24 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
@@ -1459,11 +1459,13 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                     vm.setPlatform(conn, platform);
                 }
             }
-            String xenservertoolsversion = details.get("hypervisortoolsversion");
-            if ((xenservertoolsversion == null || !xenservertoolsversion.equalsIgnoreCase("xenserver61"))
&& vmSpec.getGpuDevice() == null) {
-                Map<String, String> platform = vm.getPlatform(conn);
-                platform.remove("device_id");
-                vm.setPlatform(conn, platform);
+            if ( !BootloaderType.CD.equals(vmSpec.getBootloader())) {
+                String xenservertoolsversion = details.get("hypervisortoolsversion");
+                if ((xenservertoolsversion == null || !xenservertoolsversion.equalsIgnoreCase("xenserver61"))
&& vmSpec.getGpuDevice() == null) {
+                    Map<String, String> platform = vm.getPlatform(conn);
+                    platform.remove("device_id");
+                    vm.setPlatform(conn, platform);
+                }
             }
         }
     }


Mime
View raw message