Signed-off-by: Juan Quintela <quint...@redhat.com> --- include/migration/qemu-file-channel.h | 22 ++++++++++++++++++++++ include/migration/qemu-file.h | 3 --- migration/channel.c | 2 +- migration/colo.c | 2 +- migration/migration.c | 2 +- migration/qemu-file-channel.c | 2 +- migration/rdma.c | 2 +- migration/savevm.c | 1 + 8 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 include/migration/qemu-file-channel.h
diff --git a/include/migration/qemu-file-channel.h b/include/migration/qemu-file-channel.h new file mode 100644 index 0000000..bbbf36d --- /dev/null +++ b/include/migration/qemu-file-channel.h @@ -0,0 +1,22 @@ +/* + * QEMU migration blockers + * + * 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_FILE_CHANNEL_H +#define QEMU_FILE_CHANNEL_H + +#include "migration/qemu-file.h" +#include "io/channel.h" + +QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc); +QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc); +#endif diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 0cd648a..ec73647 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "exec/cpu-common.h" -#include "io/channel.h" /* Read a chunk of data from a file at the given position. The pos argument @@ -119,8 +118,6 @@ typedef struct QEMUFileHooks { } QEMUFileHooks; QEMUFile *qemu_fopen_ops(void *opaque, const QEMUFileOps *ops); -QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc); -QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc); void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks); int qemu_get_fd(QEMUFile *f); int qemu_fclose(QEMUFile *f); diff --git a/migration/channel.c b/migration/channel.c index 04a26c5..e4a0443 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -17,7 +17,7 @@ #include "migration/channel.h" #include "migration/tls.h" #include "migration/migration.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-channel.h" #include "trace.h" #include "qapi/error.h" #include "io/channel-tls.h" diff --git a/migration/colo.c b/migration/colo.c index e2eaccd..150ac6a 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "migration/migration.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-channel.h" #include "migration/colo.h" #include "io/channel-buffer.h" #include "trace.h" diff --git a/migration/migration.c b/migration/migration.c index c2c25fe..6e32be0 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -24,7 +24,7 @@ #include "migration/fd.h" #include "migration/socket.h" #include "migration/migration.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-channel.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "block/block.h" diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index 45c13f1..87e44ec 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-channel.h" #include "io/channel-socket.h" #include "qemu/iov.h" diff --git a/migration/rdma.c b/migration/rdma.c index 94d4840..d9a2d64 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -18,7 +18,7 @@ #include "qemu-common.h" #include "qemu/cutils.h" #include "migration/migration.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-channel.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/sockets.h" diff --git a/migration/savevm.c b/migration/savevm.c index b03973a..1e6cf79 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -36,6 +36,7 @@ #include "audio/audio.h" #include "migration/machine.h" #include "migration/migration.h" +#include "migration/qemu-file-channel.h" #include "migration/postcopy-ram.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" -- 2.9.3