diff options
author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2015-03-23 03:48:09 -0700 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-25 13:38:07 +0100 |
commit | bdd459a00a206772185970efbc38c455dc43167e (patch) | |
tree | 4173eb1e0c33aae26eb6fe21bb3507412506294d | |
parent | 4bc7b4d56657ebf75b986ad46e959cf7232ff26a (diff) |
cpus: Don't kick un-realized cpus.
following a464982499b2f637f6699e3d03e0a9d2e0b5288b, it's now possible for
there to be attempts to take the BQL before CPUs have been realized in
cases where a machine model inits peripherals before the first CPU.
BQL lock aquisition kicks the first_cpu, leading to a segfault if this
happens pre-realize. Guard the CPU kick routine to perform no action for
a CPU that doesn't exist or doesn't have a thread yet.
There was a fix to this with commit
6b49809c597331803ea941eadda813e5bb4e8fe2, but the check there misses
the case where the CPU has been inited and not realized. Strengthen the
check to make sure that the first_cpu has a thread (i.e. it is
realized) before allowing the kick.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-Id: <1427107689-6946-1-git-send-email-peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | cpus.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1119,7 +1119,7 @@ bool qemu_in_vcpu_thread(void) void qemu_mutex_lock_iothread(void) { atomic_inc(&iothread_requesting_mutex); - if (!tcg_enabled() || !first_cpu) { + if (!tcg_enabled() || !first_cpu || !first_cpu->thread) { qemu_mutex_lock(&qemu_global_mutex); atomic_dec(&iothread_requesting_mutex); } else { |