From fcf2c1b6bc08037cca9952d5c97490c74e29876b Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony.xu@citrix.com>
Date: Tue, 9 Sep 2014 14:01:23 -0700
Subject: [PATCH] CLOUDSTACK-7505:

  if VM is created from ISO, don't change platform metadat for VM on XS
---
 .../xenserver/resource/CitrixResourceBase.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 7e386a384bd..b12dc244c0f 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);
+                }
             }
         }
     }