Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #894 from MihaelaStoica/CA-203428

Browse Source 
CA-203428: XenCenter not allowing SXM from/between Cream hosts
This commit is contained in:
Gabor Apati-Nagy 2016-03-15 15:06:51 +00:00
commit cb31f6cbed
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Commands/VMOperationHostCommand.cs
View File

@ -186,7 +186,7 @@ namespace XenAdmin.Commands
public static bool VmCpuFeaturesIncompatibleWithHost(Host targetHost, VM vm)
{
// check the CPU feature compatibility for Dundee and higher hosts
if (!Helpers.DundeeOrGreater(targetHost))
if (!Helpers.DundeeOrGreater(targetHost) || !Helpers.DundeeOrGreater(vm.Connection))
return false;
// only for running or suspended VMs

5
XenModel/XenAPI-Extensions/Host.cs
View File

@ -443,9 +443,12 @@ namespace XenAPI
return h._RestrictExportResourceData;
}
/// <summary>
/// Intra pool migration is restricted only if the "restrict_xen_motion" key exists and it is true
/// </summary>
private bool _RestrictIntraPoolMigrate
{
get { return BoolKeyPreferTrue(license_params, "restrict_xen_motion"); }
get { return BoolKey(license_params, "restrict_xen_motion"); }
}
public static bool RestrictIntraPoolMigrate(Host h)