| Message ID | 20170425220451.6028-26-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > include/migration/migration.h | 4 ---- > migration/migration.c | 1 + > migration/rdma.c | 1 + > migration/rdma.h | 22 ++++++++++++++++++++++ > 4 files changed, 24 insertions(+), 4 deletions(-) > create mode 100644 migration/rdma.h > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 38ba508..9063c32 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -180,10 +180,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 ef966ca..394930d 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -22,6 +22,7 @@ > #include "fd.h" > #include "socket.h" > #include "ram.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 96a90dd..f8fea9b 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 "ram.h" > diff --git a/migration/rdma.h b/migration/rdma.h > new file mode 100644 > index 0000000..d2cf481 > --- /dev/null > +++ b/migration/rdma.h > @@ -0,0 +1,22 @@ > +/* > + * QEMU migration rdma functions > + * > + * Copyright IBM, Corp. 2008 > + * > + * Authors: > + * Anthony Liguori <aliguori@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_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 As said before, I still don't think there's any point in having each of these transports in their own header. However, I think the other problem is the Authors is wrong, both of these lines come from 2da776db484 which is Michael Hines. Dave > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/migration.h b/include/migration/migration.h index 38ba508..9063c32 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -180,10 +180,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 ef966ca..394930d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -22,6 +22,7 @@ #include "fd.h" #include "socket.h" #include "ram.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 96a90dd..f8fea9b 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 "ram.h" diff --git a/migration/rdma.h b/migration/rdma.h new file mode 100644 index 0000000..d2cf481 --- /dev/null +++ b/migration/rdma.h @@ -0,0 +1,22 @@ +/* + * QEMU migration rdma functions + * + * Copyright IBM, Corp. 2008 + * + * Authors: + * Anthony Liguori <aliguori@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_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
Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/migration.h | 4 ---- migration/migration.c | 1 + migration/rdma.c | 1 + migration/rdma.h | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 migration/rdma.h