From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1edy-0007iN-Ol for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1edx-0005ZS-Hc for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:38 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42116 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1edx-0005ZL-8I for qemu-devel@nongnu.org; Sat, 02 Feb 2013 10:04:37 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 2 Feb 2013 16:04:15 +0100 Message-Id: <1359817456-25561-6-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] [RFC qom-cpu-next 5/6] target-openrisc: Register VMStateDescription for OpenRISCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jia Liu , =?UTF-8?q?Andreas=20F=C3=A4rber?= , quintela@redhat.com Since commit e67db06e9f6d7e514ee2a9b9b769ecd42977f6fb (target-or32: Add target stubs and QOM cpu) a VMStateDescription existed, but CPU_SAVE_VERSION was not set, so it was never registered. Register it through CPUState. Use a version_id of 1 and specify minimum versions as well. Cc: Jia Liu Signed-off-by: Andreas F=C3=A4rber --- target-openrisc/cpu.c | 3 +++ target-openrisc/cpu.h | 2 ++ target-openrisc/machine.c | 33 +++++++++++++-------------------- 3 Dateien ge=C3=A4ndert, 18 Zeilen hinzugef=C3=BCgt(+), 20 Zeilen entfer= nt(-) diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index d8cc533..d0873e8 100644 --- a/target-openrisc/cpu.c +++ b/target-openrisc/cpu.c @@ -146,6 +146,9 @@ static void openrisc_cpu_class_init(ObjectClass *oc, = void *data) cc->reset =3D openrisc_cpu_reset; =20 cc->class_by_name =3D openrisc_cpu_class_by_name; +#ifndef CONFIG_USER_ONLY + cc->vmsd =3D &vmstate_openrisc_cpu; +#endif } =20 static void cpu_register(const OpenRISCCPUInfo *info) diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index 419f007..1d350d2 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -358,6 +358,8 @@ int cpu_openrisc_signal_handler(int host_signum, void= *pinfo, void *puc); #define cpu_signal_handler cpu_openrisc_signal_handler =20 #ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vmstate_openrisc_cpu; + /* hw/openrisc_pic.c */ void cpu_openrisc_pic_init(OpenRISCCPU *cpu); =20 diff --git a/target-openrisc/machine.c b/target-openrisc/machine.c index cba9811..7d335e0 100644 --- a/target-openrisc/machine.c +++ b/target-openrisc/machine.c @@ -20,28 +20,21 @@ #include "hw/hw.h" #include "hw/boards.h" =20 -static const VMStateDescription vmstate_cpu =3D { +const VMStateDescription vmstate_openrisc_cpu =3D { .name =3D "cpu", + .version_id =3D 1, + .minimum_version_id =3D 1, + .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32_ARRAY(gpr, CPUOpenRISCState, 32), - VMSTATE_UINT32(sr, CPUOpenRISCState), - VMSTATE_UINT32(epcr, CPUOpenRISCState), - VMSTATE_UINT32(eear, CPUOpenRISCState), - VMSTATE_UINT32(esr, CPUOpenRISCState), - VMSTATE_UINT32(fpcsr, CPUOpenRISCState), - VMSTATE_UINT32(pc, CPUOpenRISCState), - VMSTATE_UINT32(npc, CPUOpenRISCState), - VMSTATE_UINT32(ppc, CPUOpenRISCState), + VMSTATE_UINT32_ARRAY(env.gpr, OpenRISCCPU, 32), + VMSTATE_UINT32(env.sr, OpenRISCCPU), + VMSTATE_UINT32(env.epcr, OpenRISCCPU), + VMSTATE_UINT32(env.eear, OpenRISCCPU), + VMSTATE_UINT32(env.esr, OpenRISCCPU), + VMSTATE_UINT32(env.fpcsr, OpenRISCCPU), + VMSTATE_UINT32(env.pc, OpenRISCCPU), + VMSTATE_UINT32(env.npc, OpenRISCCPU), + VMSTATE_UINT32(env.ppc, OpenRISCCPU), 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