diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-09 15:28:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-10 10:49:25 +0100 |
| commit | cba7054928b10a7fda57c64807451bbc9a31e42e (patch) | |
| tree | 6ddc67ab341cc64df3fca8bf57d11f74474ce0ac | |
| parent | 21b7cf9e07e5991c57b461181cfb5bbb6fe7a9d6 (diff) | |
| download | focaccia-qemu-cba7054928b10a7fda57c64807451bbc9a31e42e.tar.gz focaccia-qemu-cba7054928b10a7fda57c64807451bbc9a31e42e.zip | |
cpus: initialize cpu->memory_dispatch
This fixes a NULL pointer dereference in s390x-softmmu. On pretty much all other architectures, creating an MMIO region calls cpu_reload_memory_map. On s390, however, there are no MMIO regions and everything is done via hypercalls. Fixes: 9d82b5a792236db31a75b9db5c93af69ac07c7c5 Reported-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | exec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/exec.c b/exec.c index 6a5adab502..a6cb4a241c 100644 --- a/exec.c +++ b/exec.c @@ -548,6 +548,7 @@ void cpu_exec_init(CPUArchState *env) #ifndef CONFIG_USER_ONLY cpu->as = &address_space_memory; cpu->thread_id = qemu_get_thread_id(); + cpu_reload_memory_map(cpu); #endif QTAILQ_INSERT_TAIL(&cpus, cpu, node); #if defined(CONFIG_USER_ONLY) |