|
@@ -76,12 +76,15 @@ static void watch_target(struct xenbus_watch *watch,
|
|
|
|
|
|
if (!watch_fired) {
|
|
|
watch_fired = true;
|
|
|
- err = xenbus_scanf(XBT_NIL, "memory", "static-max", "%llu",
|
|
|
- &static_max);
|
|
|
- if (err != 1)
|
|
|
- static_max = new_target;
|
|
|
- else
|
|
|
+
|
|
|
+ if ((xenbus_scanf(XBT_NIL, "memory", "static-max",
|
|
|
+ "%llu", &static_max) == 1) ||
|
|
|
+ (xenbus_scanf(XBT_NIL, "memory", "memory_static_max",
|
|
|
+ "%llu", &static_max) == 1))
|
|
|
static_max >>= PAGE_SHIFT - 10;
|
|
|
+ else
|
|
|
+ static_max = new_target;
|
|
|
+
|
|
|
target_diff = (xen_pv_domain() || xen_initial_domain()) ? 0
|
|
|
: static_max - balloon_stats.target_pages;
|
|
|
}
|