[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/26] vmstate: rename run_after_load() -> post_load
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 09/26] vmstate: rename run_after_load() -> post_load() |
Date: |
Thu, 10 Sep 2009 03:04:30 +0200 |
This naming was used in kvm tree, and is easier to remember
Signed-off-by: Juan Quintela <address@hidden>
---
hw/acpi.c | 4 ++--
hw/hw.h | 2 +-
hw/piix_pci.c | 4 ++--
hw/slavio_intctl.c | 4 ++--
hw/tcx.c | 4 ++--
savevm.c | 5 +++--
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index ef4f782..b14b9f4 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 c703975..c85ce50 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 ef3463b..edd6df0 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 259e45e..6a95f9e 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 9996219..012d01b 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 7b0989f..38f9946 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;
}
--
1.6.2.5
- [Qemu-devel] Re: [PATCH 05/26] Unexport ticks_per_sec variable. Create get_ticks_per_sec() function, (continued)
[Qemu-devel] Re: [PATCH 05/26] Unexport ticks_per_sec variable. Create get_ticks_per_sec() function, Jan Kiszka, 2009/09/11
[Qemu-devel] [PATCH 07/26] timers: move them to VMState, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 08/26] vmstate: add sensible arguments to vmstate_unregister(), Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 09/26] vmstate: rename run_after_load() -> post_load(),
Juan Quintela <=
[Qemu-devel] [PATCH 10/26] vmstate: Add pre_load() hook, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 11/26] vmstate: Add pre/post_save() hooks, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 12/26] vmstate: port cpu_comon, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 14/26] vmstate: port i8259 device, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 13/26] vmstate: port fw_cfg device, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 15/26] vmstate: add support for uint8_t equal, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 17/26] vmstate: add support for arrays of uint16_t, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 16/26] vmstate: port fdc device, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 18/26] vmstate: port dma device, Juan Quintela, 2009/09/09
[Qemu-devel] [PATCH 19/26] vmstate: port vmmouse device, Juan Quintela, 2009/09/09