From ed7214c71000c3ee31f10cb80cf79e6d93b2baee Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Wed, 10 Aug 2011 10:26:04 -0700
Subject: [PATCH] add host guid in migrate command

---
 api/src/com/cloud/agent/api/MigrateCommand.java        | 9 +++++++++
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/api/src/com/cloud/agent/api/MigrateCommand.java b/api/src/com/cloud/agent/api/MigrateCommand.java
index 502647dd8e7..94a3f3f50c7 100644
--- a/api/src/com/cloud/agent/api/MigrateCommand.java
+++ b/api/src/com/cloud/agent/api/MigrateCommand.java
@@ -20,6 +20,7 @@ package com.cloud.agent.api;
 public class MigrateCommand extends Command {
     String vmName;
     String destIp;
+    String hostGuid;
     boolean isWindows;
 
 
@@ -43,6 +44,14 @@ public class MigrateCommand extends Command {
     public String getVmName() {
         return vmName;
     }
+    
+    public void setHostGuid(String guid) {
+        this.hostGuid = guid;
+    }
+    
+    public String getHostGuid() {
+        return this.hostGuid;
+    }
 
     @Override
     public boolean executeInSequence() {
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 79a6161a943..a9c33a2c1af 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1174,6 +1174,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         try {
             boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vm.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
             MigrateCommand mc = new MigrateCommand(vm.getInstanceName(), dest.getHost().getPrivateIpAddress(), isWindows);
+            mc.setHostGuid(dest.getHost().getGuid());
+            
             try {
                 MigrateAnswer ma = (MigrateAnswer) _agentMgr.send(vm.getLastHostId(), mc);
                 if (!ma.getResult()) {