| Message ID | 20200508104933.19051-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | cpus: Fix botched configure_icount() error API violation fix | expand |
On 5/8/20 5:49 AM, Markus Armbruster wrote: > Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c > Fixes: Coverity CID 1428754 > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > cpus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/cpus.c b/cpus.c > index 5670c96bcf..b9275c672d 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) > return; > } > > - if (strcmp(option, "auto") != 0) { > + if (option && !strcmp(option, "auto")) { Another alternative would be using g_strcmp0, but this form is fine. > if (qemu_strtol(option, NULL, 0, &time_shift) < 0 > || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { > error_setg(errp, "icount: Invalid shift value"); >
On 5/8/20 3:45 PM, Eric Blake wrote: > On 5/8/20 5:49 AM, Markus Armbruster wrote: >> Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c >> Fixes: Coverity CID 1428754 >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> cpus.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Reviewed-by: Eric Blake <eblake@redhat.com> > >> >> diff --git a/cpus.c b/cpus.c >> index 5670c96bcf..b9275c672d 100644 >> --- a/cpus.c >> +++ b/cpus.c >> @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) >> return; >> } >> - if (strcmp(option, "auto") != 0) { >> + if (option && !strcmp(option, "auto")) { > > Another alternative would be using g_strcmp0, but this form is fine. "Leading by example is the fastest way to train a team." ;) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > >> if (qemu_strtol(option, NULL, 0, &time_shift) < 0 >> || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { >> error_setg(errp, "icount: Invalid shift value"); >> >
Markus Armbruster <armbru@redhat.com> writes: > Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c > Fixes: Coverity CID 1428754 > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > cpus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cpus.c b/cpus.c > index 5670c96bcf..b9275c672d 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) > return; > } > > - if (strcmp(option, "auto") != 0) { > + if (option && !strcmp(option, "auto")) { > if (qemu_strtol(option, NULL, 0, &time_shift) < 0 > || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { > error_setg(errp, "icount: Invalid shift value"); Nonsense. I shouldn't multi-task.
On 08/05/20 12:49, Markus Armbruster wrote: > Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c > Fixes: Coverity CID 1428754 > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > cpus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cpus.c b/cpus.c > index 5670c96bcf..b9275c672d 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) > return; > } > > - if (strcmp(option, "auto") != 0) { > + if (option && !strcmp(option, "auto")) { > if (qemu_strtol(option, NULL, 0, &time_shift) < 0 > || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { > error_setg(errp, "icount: Invalid shift value"); > Queued, thanks. Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > On 08/05/20 12:49, Markus Armbruster wrote: >> Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c >> Fixes: Coverity CID 1428754 >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> cpus.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/cpus.c b/cpus.c >> index 5670c96bcf..b9275c672d 100644 >> --- a/cpus.c >> +++ b/cpus.c >> @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) >> return; >> } >> >> - if (strcmp(option, "auto") != 0) { >> + if (option && !strcmp(option, "auto")) { >> if (qemu_strtol(option, NULL, 0, &time_shift) < 0 >> || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { >> error_setg(errp, "icount: Invalid shift value"); >> > > Queued, thanks. This one's wrong, please queue v2 instead.
On 25/05/20 07:44, Markus Armbruster wrote: > Paolo Bonzini <pbonzini@redhat.com> writes: > >> On 08/05/20 12:49, Markus Armbruster wrote: >>> Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c >>> Fixes: Coverity CID 1428754 >>> Signed-off-by: Markus Armbruster <armbru@redhat.com> >>> --- >>> cpus.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/cpus.c b/cpus.c >>> index 5670c96bcf..b9275c672d 100644 >>> --- a/cpus.c >>> +++ b/cpus.c >>> @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) >>> return; >>> } >>> >>> - if (strcmp(option, "auto") != 0) { >>> + if (option && !strcmp(option, "auto")) { >>> if (qemu_strtol(option, NULL, 0, &time_shift) < 0 >>> || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { >>> error_setg(errp, "icount: Invalid shift value"); >>> >> >> Queued, thanks. > > This one's wrong, please queue v2 instead. > Yep, got there already. Thanks! Paolo
diff --git a/cpus.c b/cpus.c index 5670c96bcf..b9275c672d 100644 --- a/cpus.c +++ b/cpus.c @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) return; } - if (strcmp(option, "auto") != 0) { + if (option && !strcmp(option, "auto")) { if (qemu_strtol(option, NULL, 0, &time_shift) < 0 || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { error_setg(errp, "icount: Invalid shift value");
Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c Fixes: Coverity CID 1428754 Signed-off-by: Markus Armbruster <armbru@redhat.com> --- cpus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)