5 files changed, 10 insertions, 10 deletions
diff --git a/exec.c b/exec.c
index 85076e6090..aafd8147db 100644
--- a/exec.c
+++ b/exec.c
@@ -513,9 +513,9 @@ void cpu_exec_init_all(unsigned long tb_size)
 
 #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
 
-static void cpu_common_pre_save(const void *opaque)
+static void cpu_common_pre_save(void *opaque)
 {
-    CPUState *env = (void *)opaque;
+    CPUState *env = opaque;
 
     cpu_synchronize_state(env);
 }
diff --git a/hw/fdc.c b/hw/fdc.c
index c03ab476c3..a7c65c70ff 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -643,9 +643,9 @@ static const VMStateDescription vmstate_fdrive = {
     }
 };
 
-static void fdc_pre_save(const void *opaque)
+static void fdc_pre_save(void *opaque)
 {
-    fdctrl_t *s = (void *)opaque;
+    fdctrl_t *s = opaque;
 
     s->dor_vmstate = s->dor | GET_CUR_DRV(s);
 }
diff --git a/hw/hpet.c b/hw/hpet.c
index 6535b8ebf2..64163bd524 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -157,9 +157,9 @@ static void update_irq(struct HPETTimer *timer)
     }
 }
 
-static void hpet_pre_save(const void *opaque)
+static void hpet_pre_save(void *opaque)
 {
-    HPETState *s = (void *)opaque;
+    HPETState *s = opaque;
     /* save current counter value */
     s->hpet_counter = hpet_get_ticks();
 }
diff --git a/hw/hw.h b/hw/hw.h
index 6f60493ce7..b9ae33a127 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -308,8 +308,8 @@ struct VMStateDescription {
     LoadStateHandler *load_state_old;
     int (*pre_load)(void *opaque);
     int (*post_load)(void *opaque, int version_id);
-    void (*pre_save)(const void *opaque);
-    void (*post_save)(const void *opaque);
+    void (*pre_save)(void *opaque);
+    void (*post_save)(void *opaque);
     VMStateField *fields;
 };
 
diff --git a/hw/serial.c b/hw/serial.c
index 6e37ead06e..4cdf2303a0 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -635,9 +635,9 @@ static void serial_event(void *opaque, int event)
         serial_receive_break(s);
 }
 
-static void serial_pre_save(const void *opaque)
+static void serial_pre_save(void *opaque)
 {
-    SerialState *s = (void *)opaque;
+    SerialState *s = opaque;
     s->fcr_vmstate = s->fcr;
 }