From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2lVM-0001Ni-Hb for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2lVG-0006Vc-6Y for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2lVF-0006VI-TB for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:46 -0500 From: Juan Quintela Date: Mon, 13 Jan 2014 18:39:50 +0100 Message-Id: <1389634834-24181-6-git-send-email-quintela@redhat.com> In-Reply-To: <1389634834-24181-1-git-send-email-quintela@redhat.com> References: <1389634834-24181-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 05/49] migration: Move QEMU_VM_* defines to migration/migration.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , anthony@codemonkey.ws From: Eduardo Habkost The VMState code will be moved to vmstate.c and it uses some of the QEMU_VM_* constants, so move it to a header. Signed-off-by: Eduardo Habkost Reviewed-by: Orit Wasserman Signed-off-by: Juan Quintela --- include/migration/migration.h | 11 +++++++++++ savevm.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 140e6b4..bfa3951 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -23,6 +23,17 @@ #include "qapi-types.h" #include "exec/cpu-common.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 + struct MigrationParams { bool blk; bool shared; diff --git a/savevm.c b/savevm.c index 8da1d29..46643f1 100644 --- a/savevm.c +++ b/savevm.c @@ -1821,17 +1821,6 @@ static void vmstate_save(QEMUFile *f, SaveStateEntry *se) vmstate_save_state(f,se->vmsd, se->opaque); } -#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 - bool qemu_savevm_state_blocked(Error **errp) { SaveStateEntry *se; -- 1.8.4.2