etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.x

This commit is contained in:
nit 2010-12-16 12:26:02 +05:30
parent af0d6aa568 6431408198
commit 521a2b13cc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -2904,6 +2904,11 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
vm.setActionsAfterCrash(conn, Types.OnCrashBehaviour.DESTROY);
vm.start(conn, false, true);
if (!vm.getResidentOn(conn).getUuid(conn).equals(_host.uuid)) {
startvmfailhandle(vm, null);
throw new Exception("can not start VM " + vmName + " On host " + _host.ip);
}
if (_canBridgeFirewall) {
String result = callHostPlugin("default_network_rules_systemvm", "vmName", vmName);