cpus: Fix botched configure_icount() error API violation fix
Before recent commitabc9bf69a6
, configure_icount() returned early when option "shift" was absent: succeed when option "align" was also absent, else fail. Since then, it still errors out when only "align" is present, but continues when both are absent. Crashes when examining the value of "shift" further. Reproducer: -icount "". Revert this erroneous part of the commit. Fixes:abc9bf69a6
Fixes: Coverity CID 1428754 Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200515042231.18201-1-armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
c5e1870958
commit
6c1ddc36d8
6
cpus.c
6
cpus.c
|
@ -821,8 +821,10 @@ void configure_icount(QemuOpts *opts, Error **errp)
|
||||||
bool align = qemu_opt_get_bool(opts, "align", false);
|
bool align = qemu_opt_get_bool(opts, "align", false);
|
||||||
long time_shift = -1;
|
long time_shift = -1;
|
||||||
|
|
||||||
if (!option && qemu_opt_get(opts, "align")) {
|
if (!option) {
|
||||||
error_setg(errp, "Please specify shift option when using align");
|
if (qemu_opt_get(opts, "align") != NULL) {
|
||||||
|
error_setg(errp, "Please specify shift option when using align");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue