diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-17 14:57:54 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-05-17 12:04:59 +0200 |
| commit | 1bfe5f0586083747f1602931713111673849cd9d (patch) | |
| tree | e70808d8e82700a8871ec9387835574e7ea5944d /include/migration | |
| parent | bac3b21218925006e1f7d3cae564afb1e9aeb8ee (diff) | |
migration: Move check_migratable() into qdev.c
The function is only used once, and nothing else in migration knows
about objects. Create the function vmstate_device_is_migratable() in
savem.c that really do the bit that is related with migration.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'include/migration')
| -rw-r--r-- | include/migration/migration.h | 6 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index 97e78ba908..49ec5015e5 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -22,7 +22,6 @@ #include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" -#include "qom/object.h" #define QEMU_VM_FILE_MAGIC 0x5145564d #define QEMU_VM_FILE_VERSION_COMPAT 0x00000002 @@ -39,9 +38,6 @@ #define QEMU_VM_COMMAND 0x08 #define QEMU_VM_SECTION_FOOTER 0x7e -/* for vl.c */ -extern int only_migratable; - struct MigrationParams { bool blk; bool shared; @@ -253,8 +249,6 @@ int ram_discard_range(const char *block_name, uint64_t start, size_t length); int ram_postcopy_incoming_init(MigrationIncomingState *mis); void ram_postcopy_migrated_memory_release(MigrationState *ms); -int check_migratable(Object *obj, Error **err); - bool migrate_release_ram(void); bool migrate_postcopy_ram(void); bool migrate_zero_blocks(void); diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f4bf3f1b4e..848965963a 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -1067,4 +1067,6 @@ int64_t self_announce_delay(int round) void dump_vmstate_json_to_file(FILE *out_fp); +bool vmstate_check_only_migratable(const VMStateDescription *vmsd); + #endif |