Re: [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations

[Daniel P. Berrange]

On Thu, May 18, 2017 at 05:40:54PM +0100, Dr. David Alan Gilbert wrote:
> * Juan Quintela (address@hidden) wrote:
> > Create an include for its exported functions.
> > 
> > Signed-off-by: Juan Quintela <address@hidden>
> > 
> > ---
> > Add proper header
> > ---
> >  include/migration/migration.h |  7 -----
> >  migration/Makefile.objs       |  2 +-
> >  migration/channel.c           | 69 
> > +++++++++++++++++++++++++++++++++++++++++++
> >  migration/channel.h           | 27 +++++++++++++++++
> >  migration/exec.c              |  1 +
> >  migration/fd.c                |  1 +
> >  migration/migration.c         | 50 -------------------------------
> >  migration/socket.c            |  1 +
> >  migration/tls.c               |  1 +
> >  9 files changed, 101 insertions(+), 58 deletions(-)
> >  create mode 100644 migration/channel.c
> >  create mode 100644 migration/channel.h
> > 
> > diff --git a/include/migration/migration.h b/include/migration/migration.h
> > index 7d1eef7..e831259 100644
> > --- a/include/migration/migration.h
> > +++ b/include/migration/migration.h
> > @@ -157,17 +157,10 @@ void migration_fd_process_incoming(QEMUFile *f);
> >  
> >  void qemu_start_incoming_migration(const char *uri, Error **errp);
> >  
> > -void migration_channel_process_incoming(MigrationState *s,
> > -                                        QIOChannel *ioc);
> > -
> >  void migration_tls_channel_process_incoming(MigrationState *s,
> >                                              QIOChannel *ioc,
> >                                              Error **errp);
> >  
> > -void migration_channel_connect(MigrationState *s,
> > -                               QIOChannel *ioc,
> > -                               const char *hostname);
> > -
> >  void migration_tls_channel_connect(MigrationState *s,
> >                                     QIOChannel *ioc,
> >                                     const char *hostname,
> > diff --git a/migration/Makefile.objs b/migration/Makefile.objs
> > index 00a3f4a..4e8ab0a 100644
> > --- a/migration/Makefile.objs
> > +++ b/migration/Makefile.objs
> > @@ -1,5 +1,5 @@
> >  common-obj-y += migration.o socket.o fd.o exec.o
> > -common-obj-y += tls.o
> > +common-obj-y += tls.o channel.o
> >  common-obj-y += colo-comm.o colo.o colo-failover.o
> >  common-obj-y += vmstate.o page_cache.o
> >  common-obj-y += qemu-file.o
> > diff --git a/migration/channel.c b/migration/channel.c
> > new file mode 100644
> > index 0000000..f50267a
> > --- /dev/null
> > +++ b/migration/channel.c
> > @@ -0,0 +1,69 @@
> > +/*
> > + * QEMU live migration channel operations
> > + *
> > + * Copyright Red Hat, Inc. 2016
> > + *
> > + * Authors:
> > + *  Daniel P. Berrange <address@hidden>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2.  See
> > + * the COPYING file in the top-level directory.
> > + *
> > + * Contributions after 2012-01-13 are licensed under the terms of the
> > + * GNU GPL, version 2 or (at your option) any later version.
> > + */
> 
> OK, better - but...  isn't all this after 2012?
> Since it is I think you need the header that says it's v2 or later
> (e.g. the one on migration/page_cache.c )

Yes, all the code that has been copied into these new files
post-dates that. So you can just mark the whole files (both .c and .h)
as v2 or later.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|