diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-24 17:36:46 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-13 11:00:45 +0200 |
| commit | c3d2e2e76cd6021fdf6097744449fb3f7bf7cea0 (patch) | |
| tree | 342740b623492a48a5ed745cb54ecd4f0bd85ddd | |
| parent | b7722747e4df3d3fe5e3a212974fa4ec01968edd (diff) | |
migration: Move constants to savevm.h
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
| -rw-r--r-- | include/migration/migration.h | 15 | ||||
| -rw-r--r-- | migration/savevm.h | 15 | ||||
| -rw-r--r-- | migration/vmstate.c | 1 | ||||
| -rw-r--r-- | 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 79b5484d65..dd52d3c16f 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 - /* Messages sent on the return path from destination to source */ enum mig_rp_message_type { MIG_RP_MSG_INVALID = 0, /* Must be 0 */ diff --git a/migration/savevm.h b/migration/savevm.h index eb4487771a..45b59c19bc 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 51a19b668a..377d9515f3 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -14,6 +14,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 c52aff96d6..f30433a88a 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" |