From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1edv-0007bt-VQ for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1edu-0005Xv-H8 for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:35 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42111 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1edu-0005Xl-80 for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:34 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 2 Feb 2013 16:04:13 +0100 Message-Id: <1359817456-25561-4-git-send-email-afaerber@suse.de> In-Reply-To: <1359817456-25561-1-git-send-email-afaerber@suse.de> References: <1359817456-25561-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC qom-cpu-next 3/6] target-lm32: Update VMStateDescription to LM32CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= , quintela@redhat.com Expose vmstate_cpu as vmstate_lm32_cpu and hook it up to CPUClass::vmsd. Adapt VMState fields to LM32CPU. Drop cpu_{save,load}(). Signed-off-by: Andreas F=C3=A4rber --- target-lm32/cpu-qom.h | 2 ++ target-lm32/cpu.c | 4 ++++ target-lm32/cpu.h | 2 -- target-lm32/machine.c | 36 +++++++++++++----------------------- 4 Dateien ge=C3=A4ndert, 19 Zeilen hinzugef=C3=BCgt(+), 25 Zeilen entfer= nt(-) diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h index d7525b3..9dd9d66 100644 --- a/target-lm32/cpu-qom.h +++ b/target-lm32/cpu-qom.h @@ -69,5 +69,7 @@ static inline LM32CPU *lm32_env_get_cpu(CPULM32State *e= nv) =20 #define ENV_GET_CPU(e) CPU(lm32_env_get_cpu(e)) =20 +extern const struct VMStateDescription vmstate_lm32_cpu; + =20 #endif diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index 5f16734..89c365b 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -81,6 +81,10 @@ static void lm32_cpu_class_init(ObjectClass *oc, void = *data) =20 lcc->parent_reset =3D cc->reset; cc->reset =3D lm32_cpu_reset; + +#ifndef CONFIG_USER_ONLY + cc->vmsd =3D &vmstate_lm32_cpu; +#endif } =20 static const TypeInfo lm32_cpu_type_info =3D { diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h index 4e202db..65fc366 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -213,8 +213,6 @@ static inline CPULM32State *cpu_init(const char *cpu_= model) #define cpu_gen_code cpu_lm32_gen_code #define cpu_signal_handler cpu_lm32_signal_handler =20 -#define CPU_SAVE_VERSION 1 - int cpu_lm32_handle_mmu_fault(CPULM32State *env, target_ulong address, i= nt rw, int mmu_idx); #define cpu_handle_mmu_fault cpu_lm32_handle_mmu_fault diff --git a/target-lm32/machine.c b/target-lm32/machine.c index 6802e81..aa4a9e1 100644 --- a/target-lm32/machine.c +++ b/target-lm32/machine.c @@ -1,33 +1,23 @@ #include "hw/hw.h" #include "hw/boards.h" =20 -static const VMStateDescription vmstate_cpu =3D { +const VMStateDescription vmstate_lm32_cpu =3D { .name =3D "cpu", - .version_id =3D CPU_SAVE_VERSION, + .version_id =3D 1, .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32_ARRAY(regs, CPULM32State, 32), - VMSTATE_UINT32(pc, CPULM32State), - VMSTATE_UINT32(ie, CPULM32State), - VMSTATE_UINT32(icc, CPULM32State), - VMSTATE_UINT32(dcc, CPULM32State), - VMSTATE_UINT32(cc, CPULM32State), - VMSTATE_UINT32(eba, CPULM32State), - VMSTATE_UINT32(dc, CPULM32State), - VMSTATE_UINT32(deba, CPULM32State), - VMSTATE_UINT32_ARRAY(bp, CPULM32State, 4), - VMSTATE_UINT32_ARRAY(wp, CPULM32State, 4), + VMSTATE_UINT32_ARRAY(env.regs, LM32CPU, 32), + VMSTATE_UINT32(env.pc, LM32CPU), + VMSTATE_UINT32(env.ie, LM32CPU), + VMSTATE_UINT32(env.icc, LM32CPU), + VMSTATE_UINT32(env.dcc, LM32CPU), + VMSTATE_UINT32(env.cc, LM32CPU), + VMSTATE_UINT32(env.eba, LM32CPU), + VMSTATE_UINT32(env.dc, LM32CPU), + VMSTATE_UINT32(env.deba, LM32CPU), + VMSTATE_UINT32_ARRAY(env.bp, LM32CPU, 4), + VMSTATE_UINT32_ARRAY(env.wp, LM32CPU, 4), VMSTATE_END_OF_LIST() } }; - -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); -} --=20 1.7.10.4