From patchwork Thu Nov 5 18:15:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 540608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9BCAD1402B3 for ; Fri, 6 Nov 2015 05:42:50 +1100 (AEDT) Received: from localhost ([::1]:34366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuPUm-0002fr-KT for incoming@patchwork.ozlabs.org; Thu, 05 Nov 2015 13:42:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP53-0005sn-Pe for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuP52-00054x-HL for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:16:13 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP52-00051O-8O for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:16:12 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZuP4p-0004l1-FB; Thu, 05 Nov 2015 18:15:59 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 5 Nov 2015 18:15:54 +0000 Message-Id: <1446747358-18214-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1446747358-18214-1-git-send-email-peter.maydell@linaro.org> References: <1446747358-18214-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Cc: patches@linaro.org, qemu-arm@nongnu.org, Paolo Bonzini , "Edgar E. Iglesias" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 12/16] qom/cpu: Add MemoryRegion property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;