From 7da263e4ea7aec15ffc0d868a9eca1f761d1f278 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Sat, 17 Feb 2018 21:06:18 -0500
Subject: [PATCH] target-sparc: Convert to VMStateDescription

Convert the SPARC CPU from cpu_load/save functions to VMStateDescription.
We preserve migration compatibility with the previous version
(required for SPARC32 but not necessarily for SPARC64).

Backports commit df32c8d436d4eb3f40b00647ca0df2bbc7f6bf6f from qemu
---
 qemu/target-sparc/cpu.c | 2 ++
 qemu/target-sparc/cpu.h | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/qemu/target-sparc/cpu.c b/qemu/target-sparc/cpu.c
index 662bbda2..d487a2a9 100644
--- a/qemu/target-sparc/cpu.c
+++ b/qemu/target-sparc/cpu.c
@@ -892,6 +892,8 @@ static void sparc_cpu_class_init(struct uc_struct *uc, ObjectClass *oc, void *da
     cc->do_unassigned_access = sparc_cpu_unassigned_access;
     cc->do_unaligned_access = sparc_cpu_do_unaligned_access;
     cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug;
+    // Unicorn: commented out
+    //cc->vmsd = &vmstate_sparc_cpu;
 #endif
 }
 
diff --git a/qemu/target-sparc/cpu.h b/qemu/target-sparc/cpu.h
index 3f30429a..d1969c60 100644
--- a/qemu/target-sparc/cpu.h
+++ b/qemu/target-sparc/cpu.h
@@ -374,10 +374,6 @@ struct CPUTimer
 
 typedef struct CPUTimer CPUTimer;
 
-struct QEMUFile;
-void cpu_put_timer(struct QEMUFile *f, CPUTimer *s);
-void cpu_get_timer(struct QEMUFile *f, CPUTimer *s);
-
 typedef struct CPUSPARCState CPUSPARCState;
 
 struct CPUSPARCState {
@@ -609,8 +605,6 @@ static inline CPUSPARCState *cpu_init(struct uc_struct *uc, const char *cpu_mode
 #define cpu_signal_handler cpu_sparc_signal_handler
 #define cpu_list sparc_cpu_list
 
-#define CPU_SAVE_VERSION 7
-
 /* MMU modes definitions */
 #if defined (TARGET_SPARC64)
 #define MMU_USER_IDX   0