| Message ID | 20170809070706.13481-43-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: Juergen Gross [mailto:jgross@suse.com] > Sent: 09 August 2017 08:07 > To: xen-devel@lists.xen.org > Cc: Juergen Gross <jgross@suse.com>; Paul Durrant > <Paul.Durrant@citrix.com>; Jan Beulich <jbeulich@suse.com>; Andrew > Cooper <Andrew.Cooper3@citrix.com> > Subject: [PATCH 42/52] xen/arch/x86/hvm/viridian.c: remove > custom_param() error messages > > With _cmdline_parse() now issuing error messages in case of illegal > parameters signalled by parsing functions specified in custom_param() > the message issued by parse_viridian_version() can be removed. > > Cc: Paul Durrant <paul.durrant@citrix.com> > Cc: Jan Beulich <jbeulich@suse.com> > Cc: Andrew Cooper <andrew.cooper3@citrix.com> > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Paul Durrant <paul.durrant@citrix.com> > --- > xen/arch/x86/hvm/viridian.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c > index 6f012bcb62..b15556b98b 100644 > --- a/xen/arch/x86/hvm/viridian.c > +++ b/xen/arch/x86/hvm/viridian.c > @@ -1102,15 +1102,15 @@ static int __init parse_viridian_version(char *arg) > > n[i++] = simple_strtoul(t, &e, 0); > if ( *e != '\0' ) > - goto fail; > + return -EINVAL; > } > if ( i != 3 ) > - goto fail; > + return -EINVAL; > > if ( ((typeof(viridian_major))n[0] != n[0]) || > ((typeof(viridian_minor))n[1] != n[1]) || > ((typeof(viridian_build))n[2] != n[2]) ) > - goto fail; > + return -EINVAL; > > viridian_major = n[0]; > viridian_minor = n[1]; > @@ -1119,10 +1119,6 @@ static int __init parse_viridian_version(char *arg) > printk("viridian-version = %#x,%#x,%#x\n", > viridian_major, viridian_minor, viridian_build); > return 0; > - > - fail: > - printk(XENLOG_WARNING "Invalid viridian-version, using default\n"); > - return -EINVAL; > } > custom_param("viridian-version", parse_viridian_version); > > -- > 2.12.3
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 6f012bcb62..b15556b98b 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -1102,15 +1102,15 @@ static int __init parse_viridian_version(char *arg) n[i++] = simple_strtoul(t, &e, 0); if ( *e != '\0' ) - goto fail; + return -EINVAL; } if ( i != 3 ) - goto fail; + return -EINVAL; if ( ((typeof(viridian_major))n[0] != n[0]) || ((typeof(viridian_minor))n[1] != n[1]) || ((typeof(viridian_build))n[2] != n[2]) ) - goto fail; + return -EINVAL; viridian_major = n[0]; viridian_minor = n[1]; @@ -1119,10 +1119,6 @@ static int __init parse_viridian_version(char *arg) printk("viridian-version = %#x,%#x,%#x\n", viridian_major, viridian_minor, viridian_build); return 0; - - fail: - printk(XENLOG_WARNING "Invalid viridian-version, using default\n"); - return -EINVAL; } custom_param("viridian-version", parse_viridian_version);
With _cmdline_parse() now issuing error messages in case of illegal parameters signalled by parsing functions specified in custom_param() the message issued by parse_viridian_version() can be removed. Cc: Paul Durrant <paul.durrant@citrix.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Juergen Gross <jgross@suse.com> --- xen/arch/x86/hvm/viridian.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)