Fixed highmem issues

diff --git a/data/config/GUEST_LIMITATIONS.json b/data/config/GUEST_LIMITATIONS.json
index b5ad3bcd48f122fb03232d393545ee15b969d626..d69c92e4bd791185a26e75e6d0a158dc400bbc87 100644 (file)
--- a/data/config/GUEST_LIMITATIONS.json
+++ b/data/config/GUEST_LIMITATIONS.json
@@ -490,7 +490,7 @@
     },
     "sles12": {
       "MAXMEMORY": "16384",
-      "MAXMEMORY64": "67108864",
+      "MAXMEMORY64": "4194304",
       "MINMEMORY": "4096",
     },
     "sles92": {

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index 5d7884934053b5e7a884052aa4b3ad3f5c22f68f..a48899afedbc7ccba0e0af1d74ee8531296da361 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -1203,7 +1203,7 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_SLED_12_64"] = "SUSE Linux Enterprise Desktop 12 (64-bit)"
         self.config["VERSION_CONFIG"]["Dundee"]["MAX_VBDS_PER_HOST"] = "4096"
         self.config["VERSION_CONFIG"]["Dundee"]["MAX_VDIS_PER_VM"] = "255"
-        self.config["VERSION_CONFIG"]["Dundee"]["MAX_MEM_HVM"] = "2097152"
+        self.config["VERSION_CONFIG"]["Dundee"]["MAX_MEM_HVM"] = "1572864"
 
         # XenServer dom0 partitions
         self.config["VERSION_CONFIG"]["Dundee"]["DOM0_PARTITIONS"] = {1:18*xenrt.GIGA, 2:18*xenrt.GIGA, 3:"*", 4:512*xenrt.MEGA, 5:4*xenrt.GIGA, 6:1024*xenrt.MEGA}

diff --git a/exec/xenrt/util.py b/exec/xenrt/util.py
index 1daf81d75f4892fa3d65bc9f96843cfb93ada00f..96d62aa4bd1db462e36c3ad2f857f06e47a4f737 100755 (executable)
--- a/exec/xenrt/util.py
+++ b/exec/xenrt/util.py
@@ -94,7 +94,7 @@ __all__ = ["timenow",
            "isWindows",
            "isDevLinux",
            "is32BitPV",
-           #"is64BitHVM",
+           "is64BitHVM",
            "checkXMLDomSubset",
            "getUpdateDistro",
            "getLinuxRepo",