From d32ca5ae4590b17289b9764b71d8d38ccec1af8b Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 12 Aug 2011 10:59:53 -0700
Subject: [PATCH] revert pool vm sync to host vm sync in startupcommand in
 2.2.10. then XenServer upgrade is supported in 2.2.10

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 6 ++++--
 1 file changed, 4 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 a5fcc203484..7926a616c80 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2578,8 +2578,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         }           
         try {
             final HashMap<String, VmState> vmStates = new HashMap<String, VmState>();
-            Map<VM, VM.Record> vmRs = VM.getAllRecords(conn);
-            for (VM.Record record : vmRs.values()) {
+            Host lhost = Host.getByUuid(conn, _host.uuid);
+            Set<VM> vms = lhost.getResidentVMs(conn);
+            for (VM vm: vms) {
+                VM.Record record = vm.getRecord(conn);
                 if (record.isControlDomain || record.isASnapshot || record.isATemplate) {
                     continue; // Skip DOM0
                 }