qmp: add ImageInfo in BlockDeviceInfo used by query-block

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

diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 235b088a45a6ae7b70b5c04ae0267c8b0caaacbe..a353dabdd968a0282af42aabb457c53d490b4a7c 100644 (file)
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -1,12 +1,12 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
 
 #include "cpu.h"
 
 void cpu_save(QEMUFile *f, void *opaque)
 {
-    CPUState *env = opaque;
+    CPUSPARCState *env = opaque;
     int i;
     uint32_t tmp;
 
@@ -111,7 +111,7 @@ void cpu_save(QEMUFile *f, void *opaque)
 
 int cpu_load(QEMUFile *f, void *opaque, int version_id)
 {
-    CPUState *env = opaque;
+    CPUSPARCState *env = opaque;
     int i;
     uint32_t tmp;