[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/19] qom/cpu: Add MemoryRegion property
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 12/19] qom/cpu: Add MemoryRegion property |
Date: |
Mon, 16 Nov 2015 14:05:16 +0000 |
From: Peter Crosthwaite <address@hidden>
Add a MemoryRegion property, which if set is used to construct
the CPU's initial (default) AddressSpace.
Signed-off-by: Peter Crosthwaite <address@hidden>
[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 <address@hidden>
---
cpus.c | 4 +++-
exec.c | 14 ++++++++++++++
include/qom/cpu.h | 1 +
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/cpus.c b/cpus.c
index 4cea798..aedcdd1 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()) {
diff --git a/exec.c b/exec.c
index a455632..ab55248 100644
--- a/exec.c
+++ b/exec.c
@@ -643,6 +643,20 @@ void cpu_exec_init(CPUState *cpu, Error **errp)
#ifndef CONFIG_USER_ONLY
cpu->thread_id = qemu_get_thread_id();
+
+ /* This is a softmmu CPU object, so create a property for it
+ * so users can wire up its memory. (This can't go in qom/cpu.c
+ * because that file is compiled only once for both user-mode
+ * and system builds.) The default if no link is set up is to use
+ * the system address space.
+ */
+ object_property_add_link(OBJECT(cpu), "memory", TYPE_MEMORY_REGION,
+ (Object **)&cpu->memory,
+ qdev_prop_allow_set_link_before_realize,
+ OBJ_PROP_LINK_UNREF_ON_RELEASE,
+ &error_abort);
+ cpu->memory = system_memory;
+ object_ref(OBJECT(cpu->memory));
#endif
#if defined(CONFIG_USER_ONLY)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index ed23246..2e5229d 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -297,6 +297,7 @@ struct CPUState {
CPUAddressSpace *cpu_ases;
int num_ases;
AddressSpace *as;
+ MemoryRegion *memory;
void *env_ptr; /* CPUArchState */
struct TranslationBlock *current_tb;
--
1.9.1
- [Qemu-devel] [PATCH v2 08/19] exec.c: Add cpu_get_address_space(), (continued)
- [Qemu-devel] [PATCH v2 08/19] exec.c: Add cpu_get_address_space(), Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 11/19] memory: Add address_space_init_shareable(), Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 09/19] exec.c: Use cpu_get_phys_page_attrs_debug, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 03/19] exec-all.h: Document tlb_set_page_with_attrs, tlb_set_page, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 05/19] include/qom/cpu.h: Add new asidx_from_attrs method, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 17/19] hw/arm/virt: Wire up memory region to CPUs explicitly, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 15/19] target-arm: Implement cpu_get_phys_page_attrs_debug, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 07/19] exec.c: Pass MemTxAttrs to iotlb_to_region so it uses the right AS, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 10/19] exec.c: Use correct AddressSpace in watch_mem_read and watch_mem_write, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 18/19] [RFC] hw/arm/virt: add secure memory region and UART, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 12/19] qom/cpu: Add MemoryRegion property,
Peter Maydell <=
- [Qemu-devel] [PATCH v2 04/19] include/qom/cpu.h: Add new get_phys_page_attrs_debug method, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 13/19] target-arm: Add QOM property for Secure memory region, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 16/19] target-arm: Support multiple address spaces in page table walks, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 02/19] exec.c: Allow target CPUs to define multiple AddressSpaces, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 19/19] HACK: rearrange the virt memory map to suit OP-TEE, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 06/19] cputlb.c: Use correct address space when looking up MemoryRegionSection, Peter Maydell, 2015/11/16
- [Qemu-devel] [PATCH v2 14/19] target-arm: Implement asidx_from_attrs, Peter Maydell, 2015/11/16