From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsTHr-00007v-Cd for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:12:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsTHk-00044r-OB for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:12:23 -0500 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:33980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsTHk-00044d-HE for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:12:16 -0500 Received: by mail-pa0-f50.google.com with SMTP id kl14so2617475pab.23 for ; Mon, 16 Dec 2013 00:12:15 -0800 (PST) From: edgar.iglesias@gmail.com Date: Mon, 16 Dec 2013 18:05:57 +1000 Message-Id: <1387181170-23267-10-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1387181170-23267-1-git-send-email-edgar.iglesias@gmail.com> References: <1387181170-23267-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v1 09/22] target-microblaze: Add address-space property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, blauwirbel@gmail.com, aliguori@amazon.com, pcrost@xilinx.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net, rth@twiddle.net From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-microblaze/cpu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 0ef9aa4..ada9556 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -88,11 +88,22 @@ static void mb_cpu_reset(CPUState *s) #endif } +static void mb_cpu_setup_as(CPUState *cs) +{ +#ifndef CONFIG_USER_ONLY + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); + CPUMBState *env = &cpu->env; + + cpu_address_space_init(cs, env->as); +#endif +} + static void mb_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_GET_CLASS(dev); + mb_cpu_setup_as(cs); cpu_reset(cs); qemu_init_vcpu(cs); @@ -123,6 +134,9 @@ static const VMStateDescription vmstate_mb_cpu = { }; static Property mb_properties[] = { +#ifndef CONFIG_USER_ONLY + DEFINE_PROP_ADDRESS_SPACE("address-space", MicroBlazeCPU, env.as), +#endif DEFINE_PROP_UINT32("xlnx.base-vectors", MicroBlazeCPU, base_vectors, 0), DEFINE_PROP_END_OF_LIST(), }; -- 1.7.10.4