Start removing migration code from sysemu/sysemu.h.
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
hmp.c | 1 +
include/migration/snapshot.h | 20 ++++++++++++++++++++
include/sysemu/sysemu.h | 3 ---
migration/savevm.c | 1 +
replay/replay-snapshot.c | 1 +
vl.c | 1 +
6 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 include/migration/snapshot.h
diff --git a/hmp.c b/hmp.c
index d81f71e..235cc2a 100644
--- a/hmp.c
+++ b/hmp.c
@@ -39,6 +39,7 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "hw/intc/intc.h"
+#include "migration/snapshot.h"
#ifdef CONFIG_SPICE
#include <spice/enums.h>
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
new file mode 100644
index 0000000..a390fea
--- /dev/null
+++ b/include/migration/snapshot.h
@@ -0,0 +1,20 @@
+/*
+ * QEMU save vm functions
+ *
+ * Copyright IBM, Corp. 2008
+ *
+ * Authors:
+ * Anthony Liguori <aligu...@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_MIGRATION_SAVEVM_H
+#define QEMU_MIGRATION_SAVEVM_H
+
+int save_vmstate(const char *name, Error **errp);
+int load_vmstate(const char *name, Error **errp);
+
+#endif
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 3340202..0d496d3 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -75,9 +75,6 @@ void qemu_remove_exit_notifier(Notifier *notify);
void qemu_add_machine_init_done_notifier(Notifier *notify);
void qemu_remove_machine_init_done_notifier(Notifier *notify);
-int save_vmstate(const char *name, Error **errp);
-int load_vmstate(const char *name, Error **errp);
-
void qemu_announce_self(void);
/* Subcommands for QEMU_VM_COMMAND */
diff --git a/migration/savevm.c b/migration/savevm.c
index 1b2a83c..2f76a8a 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -36,6 +36,7 @@
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "migration/migration.h"
+#include "migration/snapshot.h"
#include "qemu-file-channel.h"
#include "postcopy-ram.h"
#include "qapi/qmp/qerror.h"
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index fdc4353..86ae8dd 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -19,6 +19,7 @@
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h"
#include "migration/vmstate.h"
+#include "migration/snapshot.h"
static void replay_pre_save(void *opaque)
{
diff --git a/vl.c b/vl.c
index 8b3ec2e..53a9d19 100644
--- a/vl.c
+++ b/vl.c
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "migration/block.h"
+#include "migration/snapshot.h"
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
#include "audio/audio.h"
--
2.9.3
