From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zui3Q-0007wJ-Ev for qemu-devel@nongnu.org; Fri, 06 Nov 2015 09:31:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zui3N-0006Eg-3d for qemu-devel@nongnu.org; Fri, 06 Nov 2015 09:31:48 -0500 Date: Fri, 6 Nov 2015 15:31:39 +0100 From: "Edgar E. Iglesias" Message-ID: <20151106143139.GO13308@toto> References: <1446747358-18214-1-git-send-email-peter.maydell@linaro.org> <1446747358-18214-13-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1446747358-18214-13-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH 12/16] qom/cpu: Add MemoryRegion property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: patches@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, Paolo Bonzini , Alex =?iso-8859-1?Q?Benn=E9e?= , Andreas =?iso-8859-1?Q?F=E4rber?= On Thu, Nov 05, 2015 at 06:15:54PM +0000, Peter Maydell wrote: > From: Peter Crosthwaite > > Add a MemoryRegion property, which if set is used to construct > the CPU's initial (default) AddressSpace. > > Signed-off-by: Peter Crosthwaite > [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 Reviewed-by: Edgar E. Iglesias > --- > cpus.c | 4 +++- > exec.c | 13 +++++++++++++ > include/qom/cpu.h | 1 + > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/cpus.c b/cpus.c > index 764ea75..b7c19e0 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -1356,7 +1356,9 @@ void qemu_init_vcpu(CPUState *cpu) > /* If the target cpu hasn't set up any address spaces itself, > * give it the default one. > */ > - cpu_address_space_init(cpu, &address_space_memory, 0); > + AddressSpace *as = address_space_init_shareable(cpu->memory, > + "cpu-memory"); > + cpu_address_space_init(cpu, as, 0); > } > > if (kvm_enabled()) { > diff --git a/exec.c b/exec.c > index 9998fa0..21b1b57 100644 > --- a/exec.c > +++ b/exec.c > @@ -637,6 +637,19 @@ 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; > #endif > > #if defined(CONFIG_USER_ONLY) > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > index 10ef5cc..39a9a24 100644 > --- a/include/qom/cpu.h > +++ b/include/qom/cpu.h > @@ -292,6 +292,7 @@ struct CPUState { > CPUAddressSpace *cpu_ases; > int num_ases; > AddressSpace *as; > + MemoryRegion *memory; > > void *env_ptr; /* CPUArchState */ > struct TranslationBlock *current_tb; > -- > 1.9.1 >