Merge commit 'e5cc6429dee00f3170bb6a18600d6d29b854b7d9' into upstream-merge

* commit 'e5cc6429dee00f3170bb6a18600d6d29b854b7d9': (35 commits)
  x86: mcg_cap is never 0
  x86: send mce_banks as an array
  x86: mce_banks always have the same size
  x86: add fpregs_format_vmstate
  x86: add pending_irq_vmstate to the state
  x86: add fptag_vmstate to the state
  x86: fpus is uint16_t not unsigned int
  x86: fpuc is uint16_t not unsigned int
  x86: make a20_mask int32_t
  x86: hflags is not modified at all, just save it directly
  vmstate: remove i2c_slave_load/save
  vmstate: port lm832x device
  lm832x: make fields to have the same types that they are saved/loaded
  vmstate: add support for arrays of pointers
  vmstate: port twl92230 device
  twl92230: change pwrbtn_state to uint8_t
  vmstate: port tmp105 device
  tmp105: change len and alorm to uint8_t
  vmstate: create VMSTATE_INT16_ARRAY
  vmstate: port ssd0303 device
  ...

Conflicts:
	target-i386/machine.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/exec.c b/exec.c
index 406d2cbfa..84b642509 100644
--- a/exec.c
+++ b/exec.c
@@ -525,9 +525,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);
 }
@@ -540,7 +540,7 @@ static int cpu_common_pre_load(void *opaque)
     return 0;
 }
 
-static int cpu_common_post_load(void *opaque)
+static int cpu_common_post_load(void *opaque, int version_id)
 {
     CPUState *env = opaque;