Revision 752ff2fa

b/hw/acpi.c
441 441
        pm_io_space_update((PIIX4PMState *)d);
442 442
}
443 443

  
444
static int vmstate_acpi_after_load(void *opaque)
444
static int vmstate_acpi_post_load(void *opaque)
445 445
{
446 446
    PIIX4PMState *s = opaque;
447 447

  
......
454 454
    .version_id = 1,
455 455
    .minimum_version_id = 1,
456 456
    .minimum_version_id_old = 1,
457
    .run_after_load = vmstate_acpi_after_load,
457
    .post_load = vmstate_acpi_post_load,
458 458
    .fields      = (VMStateField []) {
459 459
        VMSTATE_PCI_DEVICE(dev, PIIX4PMState),
460 460
        VMSTATE_UINT16(pmsts, PIIX4PMState),
b/hw/hw.h
306 306
    int minimum_version_id;
307 307
    int minimum_version_id_old;
308 308
    LoadStateHandler *load_state_old;
309
    int (*run_after_load)(void *opaque);
309
    int (*post_load)(void *opaque);
310 310
    VMStateField *fields;
311 311
};
312 312

  
b/hw/piix_pci.c
172 172
    return 0;
173 173
}
174 174

  
175
static int i440fx_after_load(void *opaque)
175
static int i440fx_post_load(void *opaque)
176 176
{
177 177
    PCII440FXState *d = opaque;
178 178

  
......
186 186
    .minimum_version_id = 3,
187 187
    .minimum_version_id_old = 1,
188 188
    .load_state_old = i440fx_load_old,
189
    .run_after_load = i440fx_after_load,
189
    .post_load = i440fx_post_load,
190 190
    .fields      = (VMStateField []) {
191 191
        VMSTATE_PCI_DEVICE(dev, PCII440FXState),
192 192
        VMSTATE_UINT8(smm_enabled, PCII440FXState),
b/hw/slavio_intctl.c
374 374
    }
375 375
}
376 376

  
377
static int vmstate_intctl_after_load(void *opaque)
377
static int vmstate_intctl_post_load(void *opaque)
378 378
{
379 379
    SLAVIO_INTCTLState *s = opaque;
380 380

  
......
398 398
    .version_id = 1,
399 399
    .minimum_version_id = 1,
400 400
    .minimum_version_id_old = 1,
401
    .run_after_load = vmstate_intctl_after_load,
401
    .post_load = vmstate_intctl_post_load,
402 402
    .fields      = (VMStateField []) {
403 403
        VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS, 1,
404 404
                             vmstate_intctl_cpu, SLAVIO_CPUINTCTLState),
b/hw/tcx.c
378 378
    qemu_console_resize(s->ds, s->width, s->height);
379 379
}
380 380

  
381
static int vmstate_tcx_after_load(void *opaque)
381
static int vmstate_tcx_post_load(void *opaque)
382 382
{
383 383
    TCXState *s = opaque;
384 384

  
......
397 397
    .version_id = 4,
398 398
    .minimum_version_id = 4,
399 399
    .minimum_version_id_old = 4,
400
    .run_after_load = vmstate_tcx_after_load,
400
    .post_load = vmstate_tcx_post_load,
401 401
    .fields      = (VMStateField []) {
402 402
        VMSTATE_UINT16(height, TCXState),
403 403
        VMSTATE_UINT16(width, TCXState),
b/savevm.c
1057 1057
        }
1058 1058
        field++;
1059 1059
    }
1060
    if (vmsd->run_after_load)
1061
        return vmsd->run_after_load(opaque);
1060
    if (vmsd->post_load) {
1061
        return vmsd->post_load(opaque);
1062
    }
1062 1063
    return 0;
1063 1064
}
1064 1065

  

Also available in: Unified diff