From 52b2408c5f247251eb9d7416b2c62f562e3d1542 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 15 Jun 2012 10:51:53 -0700
Subject: [PATCH] only destroy CDROM for system VMs on current host

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 34ae8406f7b..3fd015d462c 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2719,9 +2719,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         callHostPlugin(conn, "vmopsSnapshot", "unmountSnapshotsDir", "dcId", dcId.toString());
 
         setupLinkLocalNetwork(conn);
-        // try to destroy CD-ROM device for all system VMs
+        // try to destroy CD-ROM device for all system VMs on this host
         try {
-            Set<VM> vms = VM.getAll(conn);
+            Host host = Host.getByUuid(conn, _host.uuid);
+            Set<VM> vms = host.getResidentVMs(conn);
             for ( VM vm : vms ) {
                 destroyPatchVbd(conn, vm.getNameLabel(conn));
             }