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 #886 from stephen-turner/CA-202427

Browse Source 
CA-202427: Correction: we do still need to check the vendor, so movin…
This commit is contained in:
Mihaela Stoica 2016-03-07 15:06:56 +00:00
commit 59788e2c3e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XenModel/PoolJoinRules.cs
View File

@ -263,8 +263,7 @@ namespace XenAdmin.Core
// the CPUs can be pooled but only if they are masked first.
public static bool CompatibleCPUs(Host slave, Host master, bool allowCpuLevelling)
{
// As of Dundee, feature levelling makes all CPUs compatible
if (slave == null || master == null || Helpers.DundeeOrGreater(master) || Helpers.DundeeOrGreater(slave))
if (slave == null || master == null)
return true;
Dictionary<string, string> slave_cpu_info = slave.cpu_info;
@ -277,6 +276,10 @@ namespace XenAdmin.Core
if (slave_cpu_info["vendor"] != master_cpu_info["vendor"])
return false;
// As of Dundee, feature levelling makes all CPUs from the same vendor compatible
if (Helpers.DundeeOrGreater(master) || Helpers.DundeeOrGreater(slave))
return true;
if (slave_cpu_info["features"] == master_cpu_info["features"])
return true;