Signed-off-by: Juan Quintela <quint...@redhat.com> --- include/migration/migration.h | 15 --------------- migration/savevm.h | 15 +++++++++++++++ migration/vmstate.c | 1 + tests/test-vmstate.c | 1 + 4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h index 5c27fe7..ac6e545 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -22,21 +22,6 @@ #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" -#define QEMU_VM_FILE_MAGIC 0x5145564d -#define QEMU_VM_FILE_VERSION_COMPAT 0x00000002 -#define QEMU_VM_FILE_VERSION 0x00000003 - -#define QEMU_VM_EOF 0x00 -#define QEMU_VM_SECTION_START 0x01 -#define QEMU_VM_SECTION_PART 0x02 -#define QEMU_VM_SECTION_END 0x03 -#define QEMU_VM_SECTION_FULL 0x04 -#define QEMU_VM_SUBSECTION 0x05 -#define QEMU_VM_VMDESCRIPTION 0x06 -#define QEMU_VM_CONFIGURATION 0x07 -#define QEMU_VM_COMMAND 0x08 -#define QEMU_VM_SECTION_FOOTER 0x7e - /* for vl.c */ extern int only_migratable; diff --git a/migration/savevm.h b/migration/savevm.h index 75b2b8c..b4c1f3c 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -14,6 +14,21 @@ #ifndef MIGRATION_SAVEVM_H #define MIGRATION_SAVEVM_H +#define QEMU_VM_FILE_MAGIC 0x5145564d +#define QEMU_VM_FILE_VERSION_COMPAT 0x00000002 +#define QEMU_VM_FILE_VERSION 0x00000003 + +#define QEMU_VM_EOF 0x00 +#define QEMU_VM_SECTION_START 0x01 +#define QEMU_VM_SECTION_PART 0x02 +#define QEMU_VM_SECTION_END 0x03 +#define QEMU_VM_SECTION_FULL 0x04 +#define QEMU_VM_SUBSECTION 0x05 +#define QEMU_VM_VMDESCRIPTION 0x06 +#define QEMU_VM_CONFIGURATION 0x07 +#define QEMU_VM_COMMAND 0x08 +#define QEMU_VM_SECTION_FOOTER 0x7e + bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_state_begin(QEMUFile *f); void qemu_savevm_state_header(QEMUFile *f); diff --git a/migration/vmstate.c b/migration/vmstate.c index 57dc34f..4b0cb2f 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -29,6 +29,7 @@ #include "qemu-common.h" #include "migration/migration.h" #include "migration/vmstate.h" +#include "migration/savevm.h" #include "qemu-file.h" #include "qemu/bitops.h" #include "qemu/error-report.h" diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index c52aff9..f30433a 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -30,6 +30,7 @@ #include "migration/qemu-file-types.h" #include "../migration/qemu-file.h" #include "../migration/qemu-file-channel.h" +#include "../migration/savevm.h" #include "qemu/coroutine.h" #include "io/channel-file.h" -- 2.9.3
