* Juan Quintela (quint...@redhat.com) wrote: > Just for the functions exported from tls.c. Notice that we can't > remove the migration/migration.h include from tls.c because it access > directly MigrationState for the tls params. > > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > include/migration/migration.h | 10 ---------- > migration/channel.c | 1 + > migration/migration.c | 1 - > migration/tls.c | 1 + > migration/tls.h | 34 ++++++++++++++++++++++++++++++++++ > 5 files changed, 36 insertions(+), 11 deletions(-) > create mode 100644 migration/tls.h > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 9d311ed..29fda5b 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -18,7 +18,6 @@ > #include "qemu-common.h" > #include "qemu/thread.h" > #include "qemu/notify.h" > -#include "io/channel.h" > #include "qapi-types.h" > #include "exec/cpu-common.h" > #include "qemu/coroutine_int.h" > @@ -152,15 +151,6 @@ void migration_fd_process_incoming(QEMUFile *f); > > void qemu_start_incoming_migration(const char *uri, Error **errp); > > -void migration_tls_channel_process_incoming(MigrationState *s, > - QIOChannel *ioc, > - Error **errp); > - > -void migration_tls_channel_connect(MigrationState *s, > - QIOChannel *ioc, > - const char *hostname, > - Error **errp); > - > uint64_t migrate_max_downtime(void); > > void rdma_start_outgoing_migration(void *opaque, const char *host_port, > Error **errp); > diff --git a/migration/channel.c b/migration/channel.c > index 2e78905cc..eae1d9e 100644 > --- a/migration/channel.c > +++ b/migration/channel.c > @@ -12,6 +12,7 @@ > > #include "qemu/osdep.h" > #include "channel.h" > +#include "tls.h" > #include "migration/migration.h" > #include "qemu-file-channel.h" > #include "trace.h" > diff --git a/migration/migration.c b/migration/migration.c > index f5140d2..6e11db2 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -43,7 +43,6 @@ > #include "exec/address-spaces.h" > #include "exec/target_page.h" > #include "io/channel-buffer.h" > -#include "io/channel-tls.h" > #include "migration/colo.h" > > #define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling > */ > diff --git a/migration/tls.c b/migration/tls.c > index 34ad121..bae9aca 100644 > --- a/migration/tls.c > +++ b/migration/tls.c > @@ -21,6 +21,7 @@ > #include "qemu/osdep.h" > #include "channel.h" > #include "migration/migration.h" > +#include "tls.h" > #include "io/channel-tls.h" > #include "crypto/tlscreds.h" > #include "qemu/error-report.h" > diff --git a/migration/tls.h b/migration/tls.h > new file mode 100644 > index 0000000..cdd7000 > --- /dev/null > +++ b/migration/tls.h > @@ -0,0 +1,34 @@ > +/* > + * QEMU migration TLS support > + * > + * Copyright (c) 2015 Red Hat, Inc. > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > <http://www.gnu.org/licenses/>. > + * > + */
Can you clarify why this is LGPLv2 or later please? Is this to follow the io/* rather than the migration/migration.h it came out of. Anyway, I did see Dan's post saying it was OK to update licenses, but it's worth a comment in the commit message as to why. Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Dave > + > +#ifndef QEMU_MIGRATION_TLS_H > +#define QEMU_MIGRATION_TLS_H > + > +#include "io/channel.h" > + > +void migration_tls_channel_process_incoming(MigrationState *s, > + QIOChannel *ioc, > + Error **errp); > + > +void migration_tls_channel_connect(MigrationState *s, > + QIOChannel *ioc, > + const char *hostname, > + Error **errp); > +#endif > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK