From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Juan Quintela <quintela@redhat.com>
Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com
Subject: Re: [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations
Date: Thu, 18 May 2017 18:20:26 +0100 [thread overview]
Message-ID: <20170518172026.GA12249@work-vm> (raw)
In-Reply-To: <20170518161655.30311-3-quintela@redhat.com>
* Juan Quintela (quintela@redhat.com) wrote:
> Create an include for its exported functions.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Other than needing to fix the GPLv2 to be GPLv2 or later,
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> 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 <berrange@redhat.com>
> + *
> + * 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.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "channel.h"
> +#include "migration/migration.h"
> +#include "trace.h"
> +#include "qapi/error.h"
> +#include "io/channel-tls.h"
> +
> +void migration_channel_process_incoming(MigrationState *s,
> + QIOChannel *ioc)
> +{
> + trace_migration_set_incoming_channel(
> + ioc, object_get_typename(OBJECT(ioc)));
> +
> + if (s->parameters.tls_creds &&
> + *s->parameters.tls_creds &&
> + !object_dynamic_cast(OBJECT(ioc),
> + TYPE_QIO_CHANNEL_TLS)) {
> + Error *local_err = NULL;
> + migration_tls_channel_process_incoming(s, ioc, &local_err);
> + if (local_err) {
> + error_report_err(local_err);
> + }
> + } else {
> + QEMUFile *f = qemu_fopen_channel_input(ioc);
> + migration_fd_process_incoming(f);
> + }
> +}
> +
> +
> +void migration_channel_connect(MigrationState *s,
> + QIOChannel *ioc,
> + const char *hostname)
> +{
> + trace_migration_set_outgoing_channel(
> + ioc, object_get_typename(OBJECT(ioc)), hostname);
> +
> + if (s->parameters.tls_creds &&
> + *s->parameters.tls_creds &&
> + !object_dynamic_cast(OBJECT(ioc),
> + TYPE_QIO_CHANNEL_TLS)) {
> + Error *local_err = NULL;
> + migration_tls_channel_connect(s, ioc, hostname, &local_err);
> + if (local_err) {
> + migrate_fd_error(s, local_err);
> + error_free(local_err);
> + }
> + } else {
> + QEMUFile *f = qemu_fopen_channel_output(ioc);
> +
> + s->to_dst_file = f;
> +
> + migrate_fd_connect(s);
> + }
> +}
> diff --git a/migration/channel.h b/migration/channel.h
> new file mode 100644
> index 0000000..2e0a7e3
> --- /dev/null
> +++ b/migration/channel.h
> @@ -0,0 +1,27 @@
> +/*
> + * QEMU live migration channel operations
> + *
> + * Copyright Red Hat, Inc. 2016
> + *
> + * Authors:
> + * Daniel P. Berrange <berrange@redhat.com>
> + *
> + * 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.
> + */
> +
> +#ifndef QEMU_MIGRATION_CHANNEL_H
> +#define QEMU_MIGRATION_CHANNEL_H
> +
> +#include "io/channel.h"
> +
> +void migration_channel_process_incoming(MigrationState *s,
> + QIOChannel *ioc);
> +
> +void migration_channel_connect(MigrationState *s,
> + QIOChannel *ioc,
> + const char *hostname);
> +#endif
> diff --git a/migration/exec.c b/migration/exec.c
> index aba9089..57a9335 100644
> --- a/migration/exec.c
> +++ b/migration/exec.c
> @@ -20,6 +20,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> +#include "channel.h"
> #include "migration/migration.h"
> #include "io/channel-command.h"
> #include "trace.h"
> diff --git a/migration/fd.c b/migration/fd.c
> index 58cb51a..05e0a5c 100644
> --- a/migration/fd.c
> +++ b/migration/fd.c
> @@ -17,6 +17,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> +#include "channel.h"
> #include "migration/migration.h"
> #include "monitor/monitor.h"
> #include "io/channel-util.h"
> diff --git a/migration/migration.c b/migration/migration.c
> index 2feeee8..217616d 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -444,56 +444,6 @@ void migration_fd_process_incoming(QEMUFile *f)
> qemu_coroutine_enter(co);
> }
>
> -
> -void migration_channel_process_incoming(MigrationState *s,
> - QIOChannel *ioc)
> -{
> - trace_migration_set_incoming_channel(
> - ioc, object_get_typename(OBJECT(ioc)));
> -
> - if (s->parameters.tls_creds &&
> - *s->parameters.tls_creds &&
> - !object_dynamic_cast(OBJECT(ioc),
> - TYPE_QIO_CHANNEL_TLS)) {
> - Error *local_err = NULL;
> - migration_tls_channel_process_incoming(s, ioc, &local_err);
> - if (local_err) {
> - error_report_err(local_err);
> - }
> - } else {
> - QEMUFile *f = qemu_fopen_channel_input(ioc);
> - migration_fd_process_incoming(f);
> - }
> -}
> -
> -
> -void migration_channel_connect(MigrationState *s,
> - QIOChannel *ioc,
> - const char *hostname)
> -{
> - trace_migration_set_outgoing_channel(
> - ioc, object_get_typename(OBJECT(ioc)), hostname);
> -
> - if (s->parameters.tls_creds &&
> - *s->parameters.tls_creds &&
> - !object_dynamic_cast(OBJECT(ioc),
> - TYPE_QIO_CHANNEL_TLS)) {
> - Error *local_err = NULL;
> - migration_tls_channel_connect(s, ioc, hostname, &local_err);
> - if (local_err) {
> - migrate_fd_error(s, local_err);
> - error_free(local_err);
> - }
> - } else {
> - QEMUFile *f = qemu_fopen_channel_output(ioc);
> -
> - s->to_dst_file = f;
> -
> - migrate_fd_connect(s);
> - }
> -}
> -
> -
> /*
> * Send a message on the return channel back to the source
> * of the migration.
> diff --git a/migration/socket.c b/migration/socket.c
> index 1cfbe81..53f9d61 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -19,6 +19,7 @@
> #include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> +#include "channel.h"
> #include "migration/migration.h"
> #include "migration/qemu-file.h"
> #include "io/channel-socket.h"
> diff --git a/migration/tls.c b/migration/tls.c
> index a33ecb7..34ad121 100644
> --- a/migration/tls.c
> +++ b/migration/tls.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "channel.h"
> #include "migration/migration.h"
> #include "io/channel-tls.h"
> #include "crypto/tlscreds.h"
> --
> 2.9.3
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2017-05-18 17:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-18 16:16 [Qemu-devel] [PATCH v5 0/9] Migration mini-cleanup Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 1/9] migration: Create migration/xbzrle.h Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations Juan Quintela
2017-05-18 16:40 ` Dr. David Alan Gilbert
2017-05-18 16:46 ` Daniel P. Berrange
2017-05-18 17:20 ` Dr. David Alan Gilbert [this message]
2017-05-18 16:16 ` [Qemu-devel] [PATCH 3/9] migration: Export qemu-file-channel.c functions in its own file Juan Quintela
2017-05-18 17:08 ` Dr. David Alan Gilbert
2017-05-19 2:47 ` Peter Xu
2017-05-18 16:16 ` [Qemu-devel] [PATCH 4/9] migration: Remove migration.h from colo.h Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 5/9] migration: Move qjson.h to migration/ Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 6/9] migration: Split vmstate-types.c from vmstate.c Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 7/9] migration: Remove qemu-file.h from vmstate.h Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 8/9] migration: Remove vmstate.h from migration.h Juan Quintela
2017-05-18 16:16 ` [Qemu-devel] [PATCH 9/9] migration: migration.h was not needed Juan Quintela
-- strict thread matches above, loose matches on Subject: below --
2017-05-17 15:47 [Qemu-devel] [PATCH v4 0/9] Migration mini-cleanup Juan Quintela
2017-05-17 15:47 ` [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations Juan Quintela
2017-05-18 11:59 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170518172026.GA12249@work-vm \
--to=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).