Re: [Qemu-devel] [PATCH v2 07/10] migration: Export rdma.c functions in its own file

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> "Dr. David Alan Gilbert" <address@hidden> wrote:
> > * Juan Quintela (address@hidden) wrote:
> >> Signed-off-by: Juan Quintela <address@hidden>
> >> ---
> >>  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 <address@hidden>
> >> + *  Jiuxing Liu <address@hidden>
> >> + *  Daniel P. Berrange <address@hidden>
> >> + *
> >> + * 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
> 
> That is the header file of rdma.c
> 
> And we only have two functions exported from that file, so I think that
> it is a safe assumption that they are covered by that copyright.

OK, that's fair:



Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> Later, Juan.
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK