[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] migration: Move constants to savevm.h
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 09/14] migration: Move constants to savevm.h |
Date: |
Tue, 13 Jun 2017 11:51:15 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
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 79b5484..dd52d3c 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 eb44877..45b59c1 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 51a19b6..377d951 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 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.4
- [Qemu-devel] [PULL 00/14] Migration PULL request, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 01/14] migration: isolate return path on src, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 03/14] ram: Print block stats also in the complete case, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 04/14] ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 05/14] migration: Remove MigrationState from migration_channel_incomming(), Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 02/14] migration: Don't try to set *errp directly, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 07/14] migration: Split registration functions from vmstate.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 08/14] migration: Move dump_vmsate_json_to_file() to misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 06/14] migration: Move self_announce_delay() to misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 09/14] migration: Move constants to savevm.h,
Juan Quintela <=
- [Qemu-devel] [PULL 10/14] migration: Commands are only used inside migration.c, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 11/14] migration: ram_control_* are implemented in qemu_file, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 12/14] migration: create global_state.c, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 13/14] migration: Move remaining exported functions to migration/misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 14/14] migration: Move migration.h to migration/, Juan Quintela, 2017/06/13
- Re: [Qemu-devel] [PULL 00/14] Migration PULL request, Peter Maydell, 2017/06/13