From a6bb0a855dd04e18ee2390feb56e22123846dc07 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 4 Aug 2011 11:56:37 -0700 Subject: [PATCH] Fix KVM agent connection issue, and build non-static inner class can't be serialized, also it lacks no-args constructor. --- api/src/com/cloud/agent/api/StartupRoutingCommand.java | 4 +++- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/agent/api/StartupRoutingCommand.java b/api/src/com/cloud/agent/api/StartupRoutingCommand.java index 7785dc54252..616b5c7f10f 100755 --- a/api/src/com/cloud/agent/api/StartupRoutingCommand.java +++ b/api/src/com/cloud/agent/api/StartupRoutingCommand.java @@ -26,9 +26,11 @@ import com.cloud.network.Networks.RouterPrivateIpStrategy; import com.cloud.vm.VirtualMachine.State; public class StartupRoutingCommand extends StartupCommand { - public class VmState { + public static class VmState { State state; String host; + public VmState() { + } public VmState(State state, String host) { this.state = state; this.host = host; diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index f0b19fba1b6..365a9aa0333 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -2585,7 +2585,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe if (s_logger.isTraceEnabled()) { s_logger.trace("VM " + vm_name + ": powerstate = " + ps + "; vm state=" + state.toString()); } - VmState vm_state = cmd.new VmState(state, host_uuid); + VmState vm_state = new StartupRoutingCommand.VmState(state, host_uuid); vmStates.put(vm_name, vm_state); } cmd.setChanges(vmStates);