[PATCH] balloon: don't talk about low/high memory when there is no such distinction

[PATCH] balloon: don't talk about low/high memory when there is no such distinction

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

.. in order to not confuse people.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

[-- Attachment #2: xenlinux-balloon-no-highmem.patch --]
[-- Type: text/plain, Size: 1156 bytes --]

Index: head-2006-06-13/drivers/xen/balloon/balloon.c
===================================================================
--- head-2006-06-13.orig/drivers/xen/balloon/balloon.c	2006-06-14 10:14:15.000000000 +0200
+++ head-2006-06-13/drivers/xen/balloon/balloon.c	2006-06-16 17:15:55.000000000 +0200
@@ -492,11 +492,20 @@ static int balloon_read(char *page, char
 		page,
 		"Current allocation: %8lu kB\n"
 		"Requested target:   %8lu kB\n"
+#ifdef CONFIG_HIGHMEM
 		"Low-mem balloon:    %8lu kB\n"
 		"High-mem balloon:   %8lu kB\n"
+#else
+		"Balloon:            %8lu kB\n"
+#endif
 		"Xen hard limit:     ",
 		PAGES2KB(current_pages), PAGES2KB(target_pages), 
+#ifdef CONFIG_HIGHMEM
 		PAGES2KB(balloon_low), PAGES2KB(balloon_high));
+#else
+		PAGES2KB(balloon_low));
+	WARN_ON(balloon_high);
+#endif
 
 	if (hard_limit != ~0UL) {
 		len += sprintf(
@@ -528,9 +537,6 @@ static int __init balloon_init(void)
 	current_pages = min(xen_start_info->nr_pages, max_pfn);
 	totalram_pages = current_pages;
 	target_pages  = current_pages;
-	balloon_low   = 0;
-	balloon_high  = 0;
-	driver_pages  = 0UL;
 	hard_limit    = ~0UL;
 
 	init_timer(&balloon_timer);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] balloon: don't talk about low/high memory when there is no such distinction

[Muli Ben-Yehuda]

On Fri, Jun 23, 2006 at 02:26:38PM +0200, Jan Beulich wrote:

> .. in order to not confuse people.

Hi Jan,

This will confuse any tool that parses the output of the file
though. The ifdefs are also pretty ugly... is the current output so
confusing?

Cheers,
Muli

Re: [PATCH] balloon: don't talk about low/high memory when there is no such distinction

[Anthony Liguori]

Muli Ben-Yehuda wrote:
> On Fri, Jun 23, 2006 at 02:26:38PM +0200, Jan Beulich wrote:
>
>   
>> .. in order to not confuse people.
>>     
>
> Hi Jan,
>
> This will confuse any tool that parses the output of the file
> though. The ifdefs are also pretty ugly... is the current output so
> confusing?
>   

Xend actually relies on the output of /proc/xen/balloon.  See 
tools/python/xen/xend/balloon.py

Regards,

Anthony Liguori

> Cheers,
> Muli
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>   

Re: [PATCH] balloon: don't talk about low/high memory when there is no such distinction

[Jan Beulich]

>>> Muli Ben-Yehuda <muli@il.ibm.com> 24.06.06 16:51 >>>
>On Fri, Jun 23, 2006 at 02:26:38PM +0200, Jan Beulich wrote:
>
>> .. in order to not confuse people.
>
>This will confuse any tool that parses the output of the file
>though. The ifdefs are also pretty ugly... is the current output so
>confusing?

I did get confused - I imagined 'high' and 'low' to be something entirely
different until I looked at the code in greater detail.

I generally consider tools depending on spelling or other similar things
broken. But of course, this is a personal opinion perhaps based on my
non-Unix/Linux origin.

Jan

Re: [PATCH] balloon: don't talk about low/high memory when there is no such distinction

[Keir Fraser]

On 23 Jun 2006, at 13:26, Jan Beulich wrote:

> .. in order to not confuse people.
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>

Changing the output format across architectures isn't very nice for 
scripts which may scrape the output. There's also precedent 
(/proc/meminfo includes redundant high/low distinction even on 
architectures where it makes no sense).

  -- Keir