aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/acpi.c4
-rw-r--r--hw/hw.h2
-rw-r--r--hw/piix_pci.c4
-rw-r--r--hw/slavio_intctl.c4
-rw-r--r--hw/tcx.c4
-rw-r--r--savevm.c5
6 files changed, 12 insertions, 11 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index ef4f782a2c..b14b9f4f66 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -441,7 +441,7 @@ static void pm_write_config(PCIDevice *d,
pm_io_space_update((PIIX4PMState *)d);
}
-static int vmstate_acpi_after_load(void *opaque)
+static int vmstate_acpi_post_load(void *opaque)
{
PIIX4PMState *s = opaque;
@@ -454,7 +454,7 @@ static const VMStateDescription vmstate_acpi = {
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
- .run_after_load = vmstate_acpi_after_load,
+ .post_load = vmstate_acpi_post_load,
.fields = (VMStateField []) {
VMSTATE_PCI_DEVICE(dev, PIIX4PMState),
VMSTATE_UINT16(pmsts, PIIX4PMState),
diff --git a/hw/hw.h b/hw/hw.h
index c703975035..c85ce503b4 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -306,7 +306,7 @@ struct VMStateDescription {
int minimum_version_id;
int minimum_version_id_old;
LoadStateHandler *load_state_old;
- int (*run_after_load)(void *opaque);
+ int (*post_load)(void *opaque);
VMStateField *fields;
};
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index ef3463b789..edd6df07e3 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -172,7 +172,7 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id)
return 0;
}
-static int i440fx_after_load(void *opaque)
+static int i440fx_post_load(void *opaque)
{
PCII440FXState *d = opaque;
@@ -186,7 +186,7 @@ static const VMStateDescription vmstate_i440fx = {
.minimum_version_id = 3,
.minimum_version_id_old = 1,
.load_state_old = i440fx_load_old,
- .run_after_load = i440fx_after_load,
+ .post_load = i440fx_post_load,
.fields = (VMStateField []) {
VMSTATE_PCI_DEVICE(dev, PCII440FXState),
VMSTATE_UINT8(smm_enabled, PCII440FXState),
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 259e45ee85..6a95f9ef7d 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -374,7 +374,7 @@ static void slavio_set_irq_all(void *opaque, int irq, int level)
}
}
-static int vmstate_intctl_after_load(void *opaque)
+static int vmstate_intctl_post_load(void *opaque)
{
SLAVIO_INTCTLState *s = opaque;
@@ -398,7 +398,7 @@ static const VMStateDescription vmstate_intctl = {
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
- .run_after_load = vmstate_intctl_after_load,
+ .post_load = vmstate_intctl_post_load,
.fields = (VMStateField []) {
VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS, 1,
vmstate_intctl_cpu, SLAVIO_CPUINTCTLState),
diff --git a/hw/tcx.c b/hw/tcx.c
index 9996219ab7..012d01b848 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -378,7 +378,7 @@ static void tcx24_invalidate_display(void *opaque)
qemu_console_resize(s->ds, s->width, s->height);
}
-static int vmstate_tcx_after_load(void *opaque)
+static int vmstate_tcx_post_load(void *opaque)
{
TCXState *s = opaque;
@@ -397,7 +397,7 @@ static const VMStateDescription vmstate_tcx = {
.version_id = 4,
.minimum_version_id = 4,
.minimum_version_id_old = 4,
- .run_after_load = vmstate_tcx_after_load,
+ .post_load = vmstate_tcx_post_load,
.fields = (VMStateField []) {
VMSTATE_UINT16(height, TCXState),
VMSTATE_UINT16(width, TCXState),
diff --git a/savevm.c b/savevm.c
index 7b0989ff37..38f99468f8 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1057,8 +1057,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
}
field++;
}
- if (vmsd->run_after_load)
- return vmsd->run_after_load(opaque);
+ if (vmsd->post_load) {
+ return vmsd->post_load(opaque);
+ }
return 0;
}