target-i386: fix pcmpxstrx equal-ordered (strstr) mode

[qemu.git] / target-openrisc / machine.c

diff --git a/target-openrisc/machine.c b/target-openrisc/machine.c
index cba9811ea5e5fe00b6ab4336eddd025bb5261a84..9f66a9cef226cd82e518ed13afce8c44fc021314 100644 (file)
--- a/target-openrisc/machine.c
+++ b/target-openrisc/machine.c
@@ -20,8 +20,10 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
 
 #include "hw/hw.h"
 #include "hw/boards.h"
 

-static const VMStateDescription vmstate_cpu = {
-    .name = "cpu",
+static const VMStateDescription vmstate_env = {
+    .name = "env",
+    .version_id = 1,
+    .minimum_version_id = 1,

     .fields = (VMStateField[]) {
         VMSTATE_UINT32_ARRAY(gpr, CPUOpenRISCState, 32),
         VMSTATE_UINT32(sr, CPUOpenRISCState),
     .fields = (VMStateField[]) {
         VMSTATE_UINT32_ARRAY(gpr, CPUOpenRISCState, 32),
         VMSTATE_UINT32(sr, CPUOpenRISCState),


@@ -36,12 +38,13 @@ static const VMStateDescription vmstate_cpu = {
     }
 };
 
     }
 };
 

-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);
-}
+const VMStateDescription vmstate_openrisc_cpu = {
+    .name = "cpu",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_CPU(),
+        VMSTATE_STRUCT(env, OpenRISCCPU, 1, vmstate_env, CPUOpenRISCState),
+        VMSTATE_END_OF_LIST()
+    }
+};