提交 41d64227 编写于 作者: J Juan Quintela

migration: Export tls.c functions in its own file

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: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
上级 61e8b148
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "io/channel.h"
#include "qapi-types.h" #include "qapi-types.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "qemu/coroutine_int.h" #include "qemu/coroutine_int.h"
...@@ -152,15 +151,6 @@ void migration_fd_process_incoming(QEMUFile *f); ...@@ -152,15 +151,6 @@ void migration_fd_process_incoming(QEMUFile *f);
void qemu_start_incoming_migration(const char *uri, Error **errp); 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); uint64_t migrate_max_downtime(void);
void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp); void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "channel.h" #include "channel.h"
#include "tls.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "qemu-file-channel.h" #include "qemu-file-channel.h"
#include "trace.h" #include "trace.h"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "exec/target_page.h" #include "exec/target_page.h"
#include "io/channel-buffer.h" #include "io/channel-buffer.h"
#include "io/channel-tls.h"
#include "migration/colo.h" #include "migration/colo.h"
#define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */ #define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "channel.h" #include "channel.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "tls.h"
#include "io/channel-tls.h" #include "io/channel-tls.h"
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
......
/*
* 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/>.
*
*/
#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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册