@@ -528,7 +528,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;
@@ -441,7 +441,7 @@ static void pm_write_config(PCIDevice *d,
pm_io_space_update((PIIX4PMState *)d);
}
-static int vmstate_acpi_post_load(void *opaque)
+static int vmstate_acpi_post_load(void *opaque, int version_id)
{
PIIX4PMState *s = opaque;
@@ -2955,7 +2955,7 @@ static CPUWriteMemoryFunc * const cirrus_mmio_write[3] = {
/* load/save state */
-static int cirrus_post_load(void *opaque)
+static int cirrus_post_load(void *opaque, int version_id)
{
CirrusVGAState *s = opaque;
@@ -517,7 +517,7 @@ static const VMStateDescription vmstate_dma_regs = {
}
};
-static int dma_post_load(void *opaque)
+static int dma_post_load(void *opaque, int version_id)
{
DMA_run();
@@ -650,7 +650,7 @@ static void fdc_pre_save(const void *opaque)
s->dor_vmstate = s->dor | GET_CUR_DRV(s);
}
-static int fdc_post_load(void *opaque)
+static int fdc_post_load(void *opaque, int version_id)
{
fdctrl_t *s = opaque;
@@ -164,7 +164,7 @@ static void hpet_pre_save(const void *opaque)
s->hpet_counter = hpet_get_ticks();
}
-static int hpet_post_load(void *opaque)
+static int hpet_post_load(void *opaque, int version_id)
{
HPETState *s = opaque;
@@ -307,7 +307,7 @@ struct VMStateDescription {
int minimum_version_id_old;
LoadStateHandler *load_state_old;
int (*pre_load)(void *opaque);
- int (*post_load)(void *opaque);
+ int (*post_load)(void *opaque, int version_id);
void (*pre_save)(const void *opaque);
void (*post_save)(const void *opaque);
VMStateField *fields;
@@ -172,7 +172,7 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id)
return 0;
}
-static int i440fx_post_load(void *opaque)
+static int i440fx_post_load(void *opaque, int version_id)
{
PCII440FXState *d = opaque;
@@ -648,7 +648,7 @@ static int serial_pre_load(void *opaque)
return 0;
}
-static int serial_post_load(void *opaque)
+static int serial_post_load(void *opaque, int version_id)
{
SerialState *s = opaque;
@@ -374,7 +374,7 @@ static void slavio_set_irq_all(void *opaque, int irq, int level)
}
}
-static int vmstate_intctl_post_load(void *opaque)
+static int vmstate_intctl_post_load(void *opaque, int version_id)
{
SLAVIO_INTCTLState *s = opaque;
@@ -378,7 +378,7 @@ static void tcx24_invalidate_display(void *opaque)
qemu_console_resize(s->ds, s->width, s->height);
}
-static int vmstate_tcx_post_load(void *opaque)
+static int vmstate_tcx_post_load(void *opaque, int version_id)
{
TCXState *s = opaque;
@@ -235,7 +235,7 @@ static uint32_t vmmouse_ioport_read(void *opaque, uint32_t addr)
return data[0];
}
-static int vmmouse_post_load(void *opaque)
+static int vmmouse_post_load(void *opaque, int version_id)
{
VMMouseState *s = opaque;
@@ -1084,7 +1084,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
field++;
}
if (vmsd->post_load) {
- return vmsd->post_load(opaque);
+ return vmsd->post_load(opaque, version_id);
}
return 0;
}
Signed-off-by: Juan Quintela <quintela@redhat.com> --- exec.c | 2 +- hw/acpi.c | 2 +- hw/cirrus_vga.c | 2 +- hw/dma.c | 2 +- hw/fdc.c | 2 +- hw/hpet.c | 2 +- hw/hw.h | 2 +- hw/piix_pci.c | 2 +- hw/serial.c | 2 +- hw/slavio_intctl.c | 2 +- hw/tcx.c | 2 +- hw/vmmouse.c | 2 +- savevm.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)