* Juan Quintela (quint...@redhat.com) wrote: > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > include/migration/migration.h | 4 ---- > migration/migration.c | 1 + > migration/rdma.c | 1 + > migration/rdma.h | 25 +++++++++++++++++++++++++ > 4 files changed, 27 insertions(+), 4 deletions(-) > create mode 100644 migration/rdma.h > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 29fda5b..8d29bc9 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -153,10 +153,6 @@ void qemu_start_incoming_migration(const char *uri, > Error **errp); > > uint64_t migrate_max_downtime(void); > > -void rdma_start_outgoing_migration(void *opaque, const char *host_port, > Error **errp); > - > -void rdma_start_incoming_migration(const char *host_port, Error **errp); > - > void migrate_fd_error(MigrationState *s, const Error *error); > > void migrate_fd_connect(MigrationState *s); > diff --git a/migration/migration.c b/migration/migration.c > index 6e11db2..3face58 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -21,6 +21,7 @@ > #include "exec.h" > #include "fd.h" > #include "socket.h" > +#include "rdma.h" > #include "migration/migration.h" > #include "savevm.h" > #include "qemu-file-channel.h" > diff --git a/migration/rdma.c b/migration/rdma.c > index 4cb5bf8..fab30ea 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -17,6 +17,7 @@ > #include "qapi/error.h" > #include "qemu-common.h" > #include "qemu/cutils.h" > +#include "rdma.h" > #include "migration/migration.h" > #include "qemu-file.h" > #include "exec/cpu-common.h" > diff --git a/migration/rdma.h b/migration/rdma.h > new file mode 100644 > index 0000000..de2ba09 > --- /dev/null > +++ b/migration/rdma.h > @@ -0,0 +1,25 @@ > +/* > + * RDMA protocol and interfaces > + * > + * Copyright IBM, Corp. 2010-2013 > + * Copyright Red Hat, Inc. 2015-2016 > + * > + * Authors: > + * Michael R. Hines <mrhi...@us.ibm.com> > + * Jiuxing Liu <j...@us.ibm.com> > + * Daniel P. Berrange <berra...@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > + * > + */
Hmm, are we allowed to v2-or-later that? migration.h is v2 Dave > +#ifndef QEMU_MIGRATION_RDMA_H > +#define QEMU_MIGRATION_RDMA_H > + > +void rdma_start_outgoing_migration(void *opaque, const char *host_port, > + Error **errp); > + > +void rdma_start_incoming_migration(const char *host_port, Error **errp); > + > +#endif > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK