Merge pull request #687 from stephen-turner/master

CP-12776: Increase VM memory to 1TB in anticipation of increased limi…
This commit is contained in:
Mihaela Stoica 2015-09-28 17:43:21 +01:00
commit c22429d7a3
2 changed files with 5 additions and 3 deletions

View File

@ -49,11 +49,13 @@ namespace XenAdmin
{
public const long BINARY_KILO = 1024;
public const long BINARY_MEGA = BINARY_KILO * BINARY_KILO;
public const long BINARY_GIGA = BINARY_KILO * BINARY_KILO * BINARY_KILO;
public const long BINARY_GIGA = BINARY_KILO * BINARY_MEGA;
public const long BINARY_TERA = BINARY_KILO * BINARY_GIGA;
public const long DEC_KILO = 1000;
public const long DEC_MEGA = DEC_KILO * DEC_KILO;
public const long DEC_GIGA = DEC_KILO * DEC_KILO * DEC_KILO;
public const long DEC_GIGA = DEC_KILO * DEC_MEGA;
public const long DEC_TERA = DEC_KILO * DEC_GIGA;
/// <summary>
/// The default iSCSI filer port.

View File

@ -59,7 +59,7 @@ namespace XenAPI
private const int DEFAULT_NUM_VCPUS_ALLOWED = 16;
private const int DEFAULT_NUM_VIFS_ALLOWED = 7;
private const int DEFAULT_NUM_VBDS_ALLOWED = 16;
public const long DEFAULT_MEM_ALLOWED = 128 * Util.BINARY_GIGA;
public const long DEFAULT_MEM_ALLOWED = 1 * Util.BINARY_TERA;
public const int DEFAULT_CORES_PER_SOCKET = 1;
private SnapshotsView _snapshotView = SnapshotsView.None;