xen/balloon: rationalize memory hotplug stats

The stats used for memory hotplug make no sense and are fiddled with
in odd ways.  Remove them and introduce total_pages to track the total
number of pages (both populated and unpopulated) including those within
hotplugged regions (note that this includes not yet onlined pages).

This will be used in a subsequent commit (xen/balloon: only hotplug
additional memory if required) when deciding whether additional memory
needs to be hotplugged.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/include/xen/balloon.h b/include/xen/balloon.h
index cc2e1a7e44ec..c8aee7a8b8d2 100644
--- a/include/xen/balloon.h
+++ b/include/xen/balloon.h
@@ -11,14 +11,11 @@ struct balloon_stats {
         /* Number of pages in high- and low-memory balloons. */
         unsigned long balloon_low;
         unsigned long balloon_high;
+        unsigned long total_pages;
         unsigned long schedule_delay;
         unsigned long max_schedule_delay;
         unsigned long retry_count;
         unsigned long max_retry_count;
-#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
-        unsigned long hotplug_pages;
-        unsigned long balloon_hotplug;
-#endif
 };
 
 extern struct balloon_stats balloon_stats;