summaryrefslogtreecommitdiff
path: root/cpus.c
diff options
context:
space:
mode:
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>2016-01-21 14:15:06 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-21 14:15:06 +0000
commit6731d864f80938e404dc3e5eb7f6b76b891e3e43 (patch)
tree2974134d663731aa18ae01ce816bea7043157ecf /cpus.c
parentf0c02d15b57da6f5463e3768aa0cfeedccf4b8f4 (diff)
downloadqemu-6731d864f80938e404dc3e5eb7f6b76b891e3e43.tar.gz
qemu-6731d864f80938e404dc3e5eb7f6b76b891e3e43.tar.bz2
qemu-6731d864f80938e404dc3e5eb7f6b76b891e3e43.zip
qom/cpu: Add MemoryRegion property
Add a MemoryRegion property, which if set is used to construct the CPU's initial (default) AddressSpace. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> [PMM: code is moved from qom/cpu.c to exec.c to avoid having to make qom/cpu.o be a non-common object file; code to use the MemoryRegion and to default it to system_memory added.] Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'cpus.c')
-rw-r--r--cpus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpus.c b/cpus.c
index 725a51dac9..3efff6b109 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1375,8 +1375,10 @@ void qemu_init_vcpu(CPUState *cpu)
/* If the target cpu hasn't set up any address spaces itself,
* give it the default one.
*/
+ AddressSpace *as = address_space_init_shareable(cpu->memory,
+ "cpu-memory");
cpu->num_ases = 1;
- cpu_address_space_init(cpu, &address_space_memory, 0);
+ cpu_address_space_init(cpu, as, 0);
}
if (kvm_enabled()) {