| Message ID | 20240312141343.3168265-9-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Reduce usage of QERR_ macros further | expand |
On Tue, Mar 12, 2024 at 03:13:41PM +0100, Markus Armbruster wrote: > Date: Tue, 12 Mar 2024 15:13:41 +0100 > From: Markus Armbruster <armbru@redhat.com> > Subject: [PATCH 08/10] qapi: Correct error message for 'vcpu_dirty_limit' > parameter > > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > QERR_INVALID_PARAMETER_VALUE is defined as: > > #define QERR_INVALID_PARAMETER_VALUE \ > "Parameter '%s' expects %s" > > The current error is formatted as: > > "Parameter 'vcpu_dirty_limit' expects is invalid, it must greater then 1 MB/s" > > Replace by: > > "Parameter 'vcpu_dirty_limit' is invalid, it must greater than 1 MB/s" Is there a grammar error here? Maybe s/it must greater/it must be greater/ > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > migration/options.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/migration/options.c b/migration/options.c > index 40eb930940..c5115f1b5c 100644 > --- a/migration/options.c > +++ b/migration/options.c > @@ -1264,9 +1264,8 @@ bool migrate_params_check(MigrationParameters *params, Error **errp) > > if (params->has_vcpu_dirty_limit && > (params->vcpu_dirty_limit < 1)) { > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, > - "vcpu_dirty_limit", > - "is invalid, it must greater then 1 MB/s"); > + error_setg(errp, "Parameter 'vcpu_dirty_limit' is invalid," > + " it must greater than 1 MB/s"); > return false; > } > Otherwise, Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On 12/3/24 16:26, Zhao Liu wrote: > On Tue, Mar 12, 2024 at 03:13:41PM +0100, Markus Armbruster wrote: >> Date: Tue, 12 Mar 2024 15:13:41 +0100 >> From: Markus Armbruster <armbru@redhat.com> >> Subject: [PATCH 08/10] qapi: Correct error message for 'vcpu_dirty_limit' >> parameter >> >> From: Philippe Mathieu-Daudé <philmd@linaro.org> >> >> QERR_INVALID_PARAMETER_VALUE is defined as: >> >> #define QERR_INVALID_PARAMETER_VALUE \ >> "Parameter '%s' expects %s" >> >> The current error is formatted as: >> >> "Parameter 'vcpu_dirty_limit' expects is invalid, it must greater then 1 MB/s" >> >> Replace by: >> >> "Parameter 'vcpu_dirty_limit' is invalid, it must greater than 1 MB/s" > > Is there a grammar error here? Maybe > > s/it must greater/it must be greater/ Oops indeed! > >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> Reviewed-by: Juan Quintela <quintela@redhat.com> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> migration/options.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/migration/options.c b/migration/options.c >> index 40eb930940..c5115f1b5c 100644 >> --- a/migration/options.c >> +++ b/migration/options.c >> @@ -1264,9 +1264,8 @@ bool migrate_params_check(MigrationParameters *params, Error **errp) >> >> if (params->has_vcpu_dirty_limit && >> (params->vcpu_dirty_limit < 1)) { >> - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, >> - "vcpu_dirty_limit", >> - "is invalid, it must greater then 1 MB/s"); >> + error_setg(errp, "Parameter 'vcpu_dirty_limit' is invalid," >> + " it must greater than 1 MB/s"); So s/it must greater/it must be greater/ :) >> return false; >> } >> > > Otherwise, > > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> >
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > On 12/3/24 16:26, Zhao Liu wrote: >> On Tue, Mar 12, 2024 at 03:13:41PM +0100, Markus Armbruster wrote: >>> Date: Tue, 12 Mar 2024 15:13:41 +0100 >>> From: Markus Armbruster <armbru@redhat.com> >>> Subject: [PATCH 08/10] qapi: Correct error message for 'vcpu_dirty_limit' >>> parameter >>> >>> From: Philippe Mathieu-Daudé <philmd@linaro.org> >>> >>> QERR_INVALID_PARAMETER_VALUE is defined as: >>> >>> #define QERR_INVALID_PARAMETER_VALUE \ >>> "Parameter '%s' expects %s" >>> >>> The current error is formatted as: >>> >>> "Parameter 'vcpu_dirty_limit' expects is invalid, it must greater then 1 MB/s" >>> >>> Replace by: >>> >>> "Parameter 'vcpu_dirty_limit' is invalid, it must greater than 1 MB/s" >> >> Is there a grammar error here? Maybe >> s/it must greater/it must be greater/ > > Oops indeed! What about dropping "is invalid, "? I.e. go with "Parameter 'vcpu_dirty_limit' must be greater than 1 MB/s" >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> Reviewed-by: Juan Quintela <quintela@redhat.com> >>> Signed-off-by: Markus Armbruster <armbru@redhat.com> >>> --- >>> migration/options.c | 5 ++--- >>> 1 file changed, 2 insertions(+), 3 deletions(-) >>> >>> diff --git a/migration/options.c b/migration/options.c >>> index 40eb930940..c5115f1b5c 100644 >>> --- a/migration/options.c >>> +++ b/migration/options.c >>> @@ -1264,9 +1264,8 @@ bool migrate_params_check(MigrationParameters *params, Error **errp) >>> if (params->has_vcpu_dirty_limit && >>> (params->vcpu_dirty_limit < 1)) { >>> - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, >>> - "vcpu_dirty_limit", >>> - "is invalid, it must greater then 1 MB/s"); >>> + error_setg(errp, "Parameter 'vcpu_dirty_limit' is invalid," >>> + " it must greater than 1 MB/s"); > > So s/it must greater/it must be greater/ :) > >>> return false; >>> } >>> >> Otherwise, >> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> >>
On 18/3/24 09:58, Markus Armbruster wrote: > Philippe Mathieu-Daudé <philmd@linaro.org> writes: > >> On 12/3/24 16:26, Zhao Liu wrote: >>> On Tue, Mar 12, 2024 at 03:13:41PM +0100, Markus Armbruster wrote: >>>> Date: Tue, 12 Mar 2024 15:13:41 +0100 >>>> From: Markus Armbruster <armbru@redhat.com> >>>> Subject: [PATCH 08/10] qapi: Correct error message for 'vcpu_dirty_limit' >>>> parameter >>>> >>>> From: Philippe Mathieu-Daudé <philmd@linaro.org> >>>> >>>> QERR_INVALID_PARAMETER_VALUE is defined as: >>>> >>>> #define QERR_INVALID_PARAMETER_VALUE \ >>>> "Parameter '%s' expects %s" >>>> >>>> The current error is formatted as: >>>> >>>> "Parameter 'vcpu_dirty_limit' expects is invalid, it must greater then 1 MB/s" >>>> >>>> Replace by: >>>> >>>> "Parameter 'vcpu_dirty_limit' is invalid, it must greater than 1 MB/s" >>> >>> Is there a grammar error here? Maybe >>> s/it must greater/it must be greater/ >> >> Oops indeed! > > What about dropping "is invalid, "? I.e. go with > > "Parameter 'vcpu_dirty_limit' must be greater than 1 MB/s" Yes. > >>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>>> Reviewed-by: Juan Quintela <quintela@redhat.com> >>>> Signed-off-by: Markus Armbruster <armbru@redhat.com> >>>> --- >>>> migration/options.c | 5 ++--- >>>> 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/migration/options.c b/migration/options.c index 40eb930940..c5115f1b5c 100644 --- a/migration/options.c +++ b/migration/options.c @@ -1264,9 +1264,8 @@ bool migrate_params_check(MigrationParameters *params, Error **errp) if (params->has_vcpu_dirty_limit && (params->vcpu_dirty_limit < 1)) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "vcpu_dirty_limit", - "is invalid, it must greater then 1 MB/s"); + error_setg(errp, "Parameter 'vcpu_dirty_limit' is invalid," + " it must greater than 1 MB/s"); return false; }