[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] cmdline: only set ask mode if vga= is present
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Mon, 10 Jul 2023 16:12:38 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IlsLkyE9EbE83jCQDjjMDNyDHqXyyQDGqmf1ljap4rs=; b=VLaMlJrBh4Q6R67ga9cFDypNE1ef3IYv0VHD50PyCOFXgLjUJTsZr8q82SD88NDjbgaj24QqG4wNM5ui0IQ0GKwcbfA8eJZ5N0tDQ2LzUoLViLeN7Rfck14Hqgqa/V1afXKu2/tt3UjUMVd1IxCzI51N6P068DtY8iST9CTyBFAq+IzkgIeZnpyHmcvMdoGb5FcyGHf+26EoLHNw9yjFwummfCCN1vPgV5ufHB/ePrj32t+TdEF/pizGx7JuiU9kO195XUaE2M27Y5rrCfrkvQP/wDHFjg1H4Uqb16mUriGiH0tclpj6CkKT2B0u5TfEWnb8y04z1Jupq8hcVsHtXA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c9VMYI3zTBK7T3vPn2Y+Bqg0OgCkuvx8ZI9UMH9HPykGvdtMihm4OZNpEFZKPI4PaSrA7d9ymGSaIq8k6q3XZn73IHMnht/xp9bSwy9s4yFj6PMp/bl/aMi1rx36g0UjADpsdcEwDclmmE9TZb619f4l6kHI8TjAcpc6Q6x3n+8TyQJBUMJL0X/pMa9LreohUwMAUIAl20flLRjpgIxugJ+MA2B9DmNE1bvIFcOTbfovaXVq80cST2ACZ1UCj70kt1Z5bnqWW73Pnkb94CqLJEmhNsLdjZH2y8XBHNQrtmv9L7r/82jQ2bIAjCbQNck/xnnaL8RGFHNLu5G1OaKK3w==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Mon, 10 Jul 2023 14:13:15 +0000
- Ironport-data: A9a23:TFAbs6Cv7GNM+RVW/w7iw5YqxClBgxIJ4kV8jS/XYbTApDN21mMDn GMbDDrVaa7bYzGgett0YYXk9U8CsJCAm4VrQQY4rX1jcSlH+JHPbTi7wuUcHAvJd5GeExg3h yk6QoOdRCzhZiaE/n9BCpC48T8nk/nOHuGmYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArIs t7pyyHlEAbNNwVcbCRMsspvlDs15K6p4GxB5gRnDRx2lAS2e0c9Xcp3yZ6ZdxMUcqEMdsamS uDKyq2O/2+x13/B3fv8z94X2mVTKlLjFVDmZkh+AsBOsTAbzsAG6Y4pNeJ0VKtio27hc+ada jl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CA6IoKvn3bEmp1T4E8K0YIwyKVuP0hA9 +0iDh9QPjq43+Kd+JunY7w57igjBJGD0II3nFhFlGucKMl8BJfJTuPN+MNS2yo2ioZWB/HCa sEFaD1pKhPdfxlIPVRRA5U79AuqriCnL3sE9xTL++xrvgA/zyQouFTpGMDSddGQA91cg26Tp 37c/nS/CRYfXDCa4WPcri7117WUwksXXqo5NKKxx6410GSo130NWQwpWnqHmv+Q3xvWt9V3b hZ8FjAVhbg/8gmnQ8fwWzW8oWWYpVgMVtxICeo45QqRjK3O7G6xBGIJUzpAY9wOr9ItSHoh0 Vrht8ztLSxitvuSU331y1uPhTa7OCxQKHBYYyYBFFEB+4O7/Nx1iQ/TRNF+FqLzlsfyBTz73 zGNqm45mqkXiskIka68+Dgrng6Rm3QAdSZtji2/Y45vxloRiFKND2Bw1WXm0A==
- Ironport-hdrordr: A9a23:e0gTrKEa+1/TMLiepLqE7MeALOsnbusQ8zAXPhZKOHhom62j9/ xG885x6faZslwssRIb+OxoWpPufZqGz+8R3WB5B97LYOCBggaVxepZg7cKrQeNJ8VQnNQtsp uJ38JFeb7N5fkRt7eZ3DWF
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Commit 9473d9a24182 set 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: 9473d9a24182 ('cmdline: parse multiple instances of the vga option')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Does seem to fix the broken gitlab tests:
https://gitlab.com/xen-project/people/royger/xen/-/pipelines/926397265
---
xen/arch/x86/boot/cmdline.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c
index 10dcc6142c85..74997703b31e 100644
--- a/xen/arch/x86/boot/cmdline.c
+++ b/xen/arch/x86/boot/cmdline.c
@@ -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
--
2.41.0
|
