aboutsummaryrefslogtreecommitdiff
path: root/cpus.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-05-15 06:22:31 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-06-10 12:09:59 -0400
commit6c1ddc36d8ddcb21e905dfdecfb9f2e4d4fd8acc (patch)
tree9545b5fd5b539883f8fa6c3ff392f94fd3288bdd /cpus.c
parentc5e18709585c6f2a3464f89434b0040ce5164d9d (diff)
downloadqemu-6c1ddc36d8ddcb21e905dfdecfb9f2e4d4fd8acc.zip
qemu-6c1ddc36d8ddcb21e905dfdecfb9f2e4d4fd8acc.tar.gz
qemu-6c1ddc36d8ddcb21e905dfdecfb9f2e4d4fd8acc.tar.bz2
cpus: Fix botched configure_icount() error API violation fix
Before recent commit abc9bf69a66, 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: abc9bf69a66a11499a801ff545b8fe7adbb3a04c 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>
Diffstat (limited to 'cpus.c')
-rw-r--r--cpus.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpus.c b/cpus.c
index 7ce0d56..34fc203 100644
--- a/cpus.c
+++ b/cpus.c
@@ -821,8 +821,10 @@ void configure_icount(QemuOpts *opts, Error **errp)
bool align = qemu_opt_get_bool(opts, "align", false);
long time_shift = -1;
- if (!option && qemu_opt_get(opts, "align")) {
- error_setg(errp, "Please specify shift option when using align");
+ if (!option) {
+ if (qemu_opt_get(opts, "align") != NULL) {
+ error_setg(errp, "Please specify shift option when using align");
+ }
return;
}