From ea140035d01afe28b896b6cb9848f2b2824d1bd2 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 18 Feb 2022 14:46:27 +0100 Subject: [PATCH] video/vesa: adjust (not just) command line option handling Document the remaining option. Add section annotation to the variable holding the parsed value as well as a few adjacent ones. Adjust the types of font_height and vga_compat. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- docs/misc/xen-command-line.pandoc | 5 +++++ xen/drivers/video/vesa.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index ba5164eb64..321a9abfc1 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2492,6 +2492,11 @@ cache-warming. 1ms (1000) has been measured as a good value. ### vesa-ram > `= ` +> Default: `0` + +This allows to override the amount of video RAM, in MiB, determined to be +present. + ### vga > `= ( ask | current | text-80x | gfx-xx | mode- )[,keep]` diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c index 8ff1b1d4ea..0342a3dede 100644 --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -19,16 +19,16 @@ static void lfb_flush(void); -static unsigned char *lfb; -static const struct font_desc *font; -static bool_t vga_compat; +static unsigned char *__read_mostly lfb; +static const struct font_desc *__initdata font; +static bool __initdata vga_compat; -static unsigned int vram_total; +static unsigned int __initdata vram_total; integer_param("vesa-ram", vram_total); static unsigned int __initdata vram_remap; -static int font_height; +static unsigned int __initdata font_height; static int __init parse_font_height(const char *s) { if ( simple_strtoul(s, &s, 10) == 8 && (*s++ == 'x') ) -- 2.30.2