From patchwork Mon Feb 18 19:42:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 221523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3496F2C0291 for ; Tue, 19 Feb 2013 09:20:53 +1100 (EST) Received: from localhost ([::1]:57806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Wcs-0003Yn-2j for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 14:43:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7WcE-0001pY-Gx for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7WcC-0008SO-0A for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:06 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46495 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7WcB-0008S2-NS for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:03 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3782FA51B6; Mon, 18 Feb 2013 20:43:03 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 20:42:31 +0100 Message-Id: <1361216553-4549-7-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361216553-4549-1-git-send-email-afaerber@suse.de> References: <1361216553-4549-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Richard Henderson , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC qom-cpu v2 6/8] target-alpha: Register VMStateDescription for AlphaCPU 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 Commit b758aca1f6cdb175634812b79f5560c36c902d00 (target-alpha: Enable the alpha-softmmu target.) introduced cpu_{save,load}() functions but didn't define CPU_SAVE_VERSION, so they were never registered. Drop cpu_{save,load}() and register the VMStateDescription via CPUClass. This operates on the AlphaCPU object instead of CPUAlphaState. Signed-off-by: Andreas Färber --- target-alpha/cpu-qom.h | 6 +++++ target-alpha/cpu.c | 2 ++ target-alpha/machine.c | 64 ++++++++++++++++++++++-------------------------- 3 Dateien geändert, 37 Zeilen hinzugefügt(+), 35 Zeilen entfernt(-) diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index c0f6c6d..2f9f78f 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -72,5 +72,11 @@ static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) #define ENV_GET_CPU(e) CPU(alpha_env_get_cpu(e)) +#ifdef CONFIG_USER_ONLY +#define vmstate_alpha_cpu vmstate_dummy +#else +extern const struct VMStateDescription vmstate_alpha_cpu; +#endif + #endif diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c index cec9989..0e739ad 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "qemu-common.h" +#include "migration/vmstate.h" static void alpha_cpu_realizefn(DeviceState *dev, Error **errp) @@ -263,6 +264,7 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) dc->realize = alpha_cpu_realizefn; cc->class_by_name = alpha_cpu_class_by_name; + cc->vmsd = &vmstate_alpha_cpu; } static const TypeInfo alpha_cpu_type_info = { diff --git a/target-alpha/machine.c b/target-alpha/machine.c index 1c9edd1..bdad91e 100644 --- a/target-alpha/machine.c +++ b/target-alpha/machine.c @@ -3,14 +3,18 @@ static int get_fpcr(QEMUFile *f, void *opaque, size_t size) { - CPUAlphaState *env = opaque; + AlphaCPU *cpu = opaque; + CPUAlphaState *env = &cpu->env; + cpu_alpha_store_fpcr(env, qemu_get_be64(f)); return 0; } static void put_fpcr(QEMUFile *f, void *opaque, size_t size) { - CPUAlphaState *env = opaque; + AlphaCPU *cpu = opaque; + CPUAlphaState *env = &cpu->env; + qemu_put_be64(f, cpu_alpha_load_fpcr(env)); } @@ -21,8 +25,8 @@ static const VMStateInfo vmstate_fpcr = { }; static VMStateField vmstate_cpu_fields[] = { - VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31), - VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31), + VMSTATE_UINTTL_ARRAY(env.ir, AlphaCPU, 31), + VMSTATE_UINTTL_ARRAY(env.fir, AlphaCPU, 31), /* Save the architecture value of the fpcr, not the internally expanded version. Since this architecture value does not exist in memory to be stored, this requires a but of hoop @@ -37,51 +41,41 @@ static VMStateField vmstate_cpu_fields[] = { .flags = VMS_SINGLE, .offset = 0 }, - VMSTATE_UINTTL(pc, CPUAlphaState), - VMSTATE_UINTTL(unique, CPUAlphaState), - VMSTATE_UINTTL(lock_addr, CPUAlphaState), - VMSTATE_UINTTL(lock_value, CPUAlphaState), + VMSTATE_UINTTL(env.pc, AlphaCPU), + VMSTATE_UINTTL(env.unique, AlphaCPU), + VMSTATE_UINTTL(env.lock_addr, AlphaCPU), + VMSTATE_UINTTL(env.lock_value, AlphaCPU), /* Note that lock_st_addr is not saved; it is a temporary used during the execution of the st[lq]_c insns. */ - VMSTATE_UINT8(ps, CPUAlphaState), - VMSTATE_UINT8(intr_flag, CPUAlphaState), - VMSTATE_UINT8(pal_mode, CPUAlphaState), - VMSTATE_UINT8(fen, CPUAlphaState), + VMSTATE_UINT8(env.ps, AlphaCPU), + VMSTATE_UINT8(env.intr_flag, AlphaCPU), + VMSTATE_UINT8(env.pal_mode, AlphaCPU), + VMSTATE_UINT8(env.fen, AlphaCPU), - VMSTATE_UINT32(pcc_ofs, CPUAlphaState), + VMSTATE_UINT32(env.pcc_ofs, AlphaCPU), - VMSTATE_UINTTL(trap_arg0, CPUAlphaState), - VMSTATE_UINTTL(trap_arg1, CPUAlphaState), - VMSTATE_UINTTL(trap_arg2, CPUAlphaState), + VMSTATE_UINTTL(env.trap_arg0, AlphaCPU), + VMSTATE_UINTTL(env.trap_arg1, AlphaCPU), + VMSTATE_UINTTL(env.trap_arg2, AlphaCPU), - VMSTATE_UINTTL(exc_addr, CPUAlphaState), - VMSTATE_UINTTL(palbr, CPUAlphaState), - VMSTATE_UINTTL(ptbr, CPUAlphaState), - VMSTATE_UINTTL(vptptr, CPUAlphaState), - VMSTATE_UINTTL(sysval, CPUAlphaState), - VMSTATE_UINTTL(usp, CPUAlphaState), + VMSTATE_UINTTL(env.exc_addr, AlphaCPU), + VMSTATE_UINTTL(env.palbr, AlphaCPU), + VMSTATE_UINTTL(env.ptbr, AlphaCPU), + VMSTATE_UINTTL(env.vptptr, AlphaCPU), + VMSTATE_UINTTL(env.sysval, AlphaCPU), + VMSTATE_UINTTL(env.usp, AlphaCPU), - VMSTATE_UINTTL_ARRAY(shadow, CPUAlphaState, 8), - VMSTATE_UINTTL_ARRAY(scratch, CPUAlphaState, 24), + VMSTATE_UINTTL_ARRAY(env.shadow, AlphaCPU, 8), + VMSTATE_UINTTL_ARRAY(env.scratch, AlphaCPU, 24), VMSTATE_END_OF_LIST() }; -static const VMStateDescription vmstate_cpu = { +const VMStateDescription vmstate_alpha_cpu = { .name = "cpu", .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = vmstate_cpu_fields, }; - -void cpu_save(QEMUFile *f, void *opaque) -{ - vmstate_save_state(f, &vmstate_cpu, opaque); -} - -int cpu_load(QEMUFile *f, void *opaque, int version_id) -{ - return vmstate_load_state(f, &vmstate_cpu, opaque, version_id); -}