migration: Split registration functions from vmstate.h
They are indpendent, and nowadays almost every device register things with qdev->vmsd. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
parent
f8d806c992
commit
f2a8f0a631
|
@ -26,6 +26,7 @@
|
||||||
#include "qemu/bswap.h"
|
#include "qemu/bswap.h"
|
||||||
#include "hw/pci/msix.h"
|
#include "hw/pci/msix.h"
|
||||||
#include "hw/pci/msi.h"
|
#include "hw/pci/msi.h"
|
||||||
|
#include "migration/register.h"
|
||||||
|
|
||||||
#include "vmxnet3.h"
|
#include "vmxnet3.h"
|
||||||
#include "vmxnet_debug.h"
|
#include "vmxnet_debug.h"
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#include "sysemu/hw_accel.h"
|
#include "sysemu/hw_accel.h"
|
||||||
#include "kvm_ppc.h"
|
#include "kvm_ppc.h"
|
||||||
#include "migration/migration.h"
|
#include "migration/migration.h"
|
||||||
|
#include "migration/register.h"
|
||||||
#include "mmu-hash64.h"
|
#include "mmu-hash64.h"
|
||||||
#include "mmu-book3s-v3.h"
|
#include "mmu-book3s-v3.h"
|
||||||
#include "qom/cpu.h"
|
#include "qom/cpu.h"
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include "hw/s390x/storage-keys.h"
|
#include "hw/s390x/storage-keys.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "sysemu/kvm.h"
|
#include "sysemu/kvm.h"
|
||||||
|
#include "migration/register.h"
|
||||||
|
|
||||||
#define S390_SKEYS_BUFFER_SIZE 131072 /* Room for 128k storage keys */
|
#define S390_SKEYS_BUFFER_SIZE 131072 /* Room for 128k storage keys */
|
||||||
#define S390_SKEYS_SAVE_FLAG_EOS 0x01
|
#define S390_SKEYS_SAVE_FLAG_EOS 0x01
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "ipl.h"
|
#include "ipl.h"
|
||||||
#include "hw/s390x/s390-virtio-ccw.h"
|
#include "hw/s390x/s390-virtio-ccw.h"
|
||||||
#include "hw/s390x/css-bridge.h"
|
#include "hw/s390x/css-bridge.h"
|
||||||
|
#include "migration/register.h"
|
||||||
|
|
||||||
static const char *const reset_dev_types[] = {
|
static const char *const reset_dev_types[] = {
|
||||||
TYPE_VIRTUAL_CSS_BRIDGE,
|
TYPE_VIRTUAL_CSS_BRIDGE,
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* QEMU migration vmstate registration
|
||||||
|
*
|
||||||
|
* Copyright IBM, Corp. 2008
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Anthony Liguori <aliguori@us.ibm.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
||||||
|
* the COPYING file in the top-level directory.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MIGRATION_REGISTER_H
|
||||||
|
#define MIGRATION_REGISTER_H
|
||||||
|
|
||||||
|
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
|
||||||
|
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
|
||||||
|
|
||||||
|
typedef struct SaveVMHandlers {
|
||||||
|
/* This runs inside the iothread lock. */
|
||||||
|
SaveStateHandler *save_state;
|
||||||
|
|
||||||
|
void (*cleanup)(void *opaque);
|
||||||
|
int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque);
|
||||||
|
int (*save_live_complete_precopy)(QEMUFile *f, void *opaque);
|
||||||
|
|
||||||
|
/* This runs both outside and inside the iothread lock. */
|
||||||
|
bool (*is_active)(void *opaque);
|
||||||
|
|
||||||
|
/* This runs outside the iothread lock in the migration case, and
|
||||||
|
* within the lock in the savevm case. The callback had better only
|
||||||
|
* use data that is local to the migration thread or protected
|
||||||
|
* by other locks.
|
||||||
|
*/
|
||||||
|
int (*save_live_iterate)(QEMUFile *f, void *opaque);
|
||||||
|
|
||||||
|
/* This runs outside the iothread lock! */
|
||||||
|
int (*save_live_setup)(QEMUFile *f, void *opaque);
|
||||||
|
void (*save_live_pending)(QEMUFile *f, void *opaque,
|
||||||
|
uint64_t threshold_size,
|
||||||
|
uint64_t *non_postcopiable_pending,
|
||||||
|
uint64_t *postcopiable_pending);
|
||||||
|
LoadStateHandler *load_state;
|
||||||
|
} SaveVMHandlers;
|
||||||
|
|
||||||
|
int register_savevm_live(DeviceState *dev,
|
||||||
|
const char *idstr,
|
||||||
|
int instance_id,
|
||||||
|
int version_id,
|
||||||
|
SaveVMHandlers *ops,
|
||||||
|
void *opaque);
|
||||||
|
|
||||||
|
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);
|
||||||
|
|
||||||
|
#endif
|
|
@ -29,45 +29,7 @@
|
||||||
|
|
||||||
#include "migration/qjson.h"
|
#include "migration/qjson.h"
|
||||||
|
|
||||||
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
|
|
||||||
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
|
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
|
||||||
|
|
||||||
typedef struct SaveVMHandlers {
|
|
||||||
/* This runs inside the iothread lock. */
|
|
||||||
SaveStateHandler *save_state;
|
|
||||||
|
|
||||||
void (*cleanup)(void *opaque);
|
|
||||||
int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque);
|
|
||||||
int (*save_live_complete_precopy)(QEMUFile *f, void *opaque);
|
|
||||||
|
|
||||||
/* This runs both outside and inside the iothread lock. */
|
|
||||||
bool (*is_active)(void *opaque);
|
|
||||||
|
|
||||||
/* This runs outside the iothread lock in the migration case, and
|
|
||||||
* within the lock in the savevm case. The callback had better only
|
|
||||||
* use data that is local to the migration thread or protected
|
|
||||||
* by other locks.
|
|
||||||
*/
|
|
||||||
int (*save_live_iterate)(QEMUFile *f, void *opaque);
|
|
||||||
|
|
||||||
/* This runs outside the iothread lock! */
|
|
||||||
int (*save_live_setup)(QEMUFile *f, void *opaque);
|
|
||||||
void (*save_live_pending)(QEMUFile *f, void *opaque,
|
|
||||||
uint64_t threshold_size,
|
|
||||||
uint64_t *non_postcopiable_pending,
|
|
||||||
uint64_t *postcopiable_pending);
|
|
||||||
LoadStateHandler *load_state;
|
|
||||||
} SaveVMHandlers;
|
|
||||||
|
|
||||||
int register_savevm_live(DeviceState *dev,
|
|
||||||
const char *idstr,
|
|
||||||
int instance_id,
|
|
||||||
int version_id,
|
|
||||||
SaveVMHandlers *ops,
|
|
||||||
void *opaque);
|
|
||||||
|
|
||||||
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);
|
|
||||||
|
|
||||||
typedef struct VMStateInfo VMStateInfo;
|
typedef struct VMStateInfo VMStateInfo;
|
||||||
typedef struct VMStateDescription VMStateDescription;
|
typedef struct VMStateDescription VMStateDescription;
|
||||||
typedef struct VMStateField VMStateField;
|
typedef struct VMStateField VMStateField;
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "migration/misc.h"
|
#include "migration/misc.h"
|
||||||
#include "migration/migration.h"
|
#include "migration/migration.h"
|
||||||
|
#include "migration/register.h"
|
||||||
#include "sysemu/blockdev.h"
|
#include "sysemu/blockdev.h"
|
||||||
#include "qemu-file.h"
|
#include "qemu-file.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include "xbzrle.h"
|
#include "xbzrle.h"
|
||||||
#include "ram.h"
|
#include "ram.h"
|
||||||
#include "migration/migration.h"
|
#include "migration/migration.h"
|
||||||
|
#include "migration/register.h"
|
||||||
#include "migration/misc.h"
|
#include "migration/misc.h"
|
||||||
#include "qemu-file.h"
|
#include "qemu-file.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
#include "migration/migration.h"
|
#include "migration/migration.h"
|
||||||
#include "migration/snapshot.h"
|
#include "migration/snapshot.h"
|
||||||
#include "migration/misc.h"
|
#include "migration/misc.h"
|
||||||
|
#include "migration/register.h"
|
||||||
#include "ram.h"
|
#include "ram.h"
|
||||||
#include "qemu-file-channel.h"
|
#include "qemu-file-channel.h"
|
||||||
#include "qemu-file.h"
|
#include "qemu-file.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "chardev/char-fe.h"
|
#include "chardev/char-fe.h"
|
||||||
|
#include "migration/register.h"
|
||||||
#include "slirp.h"
|
#include "slirp.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "qemu/cutils.h"
|
#include "qemu/cutils.h"
|
||||||
|
|
Loading…
Reference in New Issue