mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
cmdline: only set ask mode if vga= is present
Commit9473d9a241set the ASK mode without checking if there was a `vga` option provided in the command line. This breaks existing behavior, so exit early without changes if `vga` is not present in the command line. Fixes:9473d9a241('cmdline: parse multiple instances of the vga option') Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
fd62986f6b
commit
b831326ee2
1 file changed
+6
-1
@@ -279,9 +279,13 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo)
|
||||
{
|
||||
const char *c = cmdline;
|
||||
|
||||
c = find_opt(c, "vga=", true);
|
||||
if ( !c )
|
||||
return;
|
||||
|
||||
ebo->boot_vid_mode = ASK_VGA;
|
||||
|
||||
while ( (c = find_opt(c, "vga=", true)) != NULL )
|
||||
do
|
||||
{
|
||||
unsigned int tmp, vesa_depth, vesa_height, vesa_width;
|
||||
|
||||
@@ -332,6 +336,7 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo)
|
||||
else if ( !strmaxcmp(c, "ask", delim_chars_comma) )
|
||||
ebo->boot_vid_mode = ASK_VGA;
|
||||
}
|
||||
while ( (c = find_opt(c, "vga=", true)) != NULL );
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||