From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com
Subject: [Qemu-devel] [PULL 10/15] migration: Export socket.c functions in its own file
Date: Thu, 1 Jun 2017 21:23:22 +0200 [thread overview]
Message-ID: <20170601192327.29712-11-quintela@redhat.com> (raw)
In-Reply-To: <20170601192327.29712-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
include/migration/migration.h | 8 --------
migration/migration.c | 1 +
migration/socket.c | 1 +
migration/socket.h | 28 ++++++++++++++++++++++++++++
4 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 migration/socket.h
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d249c13..9d311ed 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -163,14 +163,6 @@ void migration_tls_channel_connect(MigrationState *s,
uint64_t migrate_max_downtime(void);
-void tcp_start_incoming_migration(const char *host_port, Error **errp);
-
-void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
-
-void unix_start_incoming_migration(const char *path, Error **errp);
-
-void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
-
void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp);
void rdma_start_incoming_migration(const char *host_port, Error **errp);
diff --git a/migration/migration.c b/migration/migration.c
index ec93f7a..e6e36fa 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -20,6 +20,7 @@
#include "migration/blocker.h"
#include "exec.h"
#include "fd.h"
+#include "socket.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
diff --git a/migration/socket.c b/migration/socket.c
index 3f8ffc9..85bfdcc 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -20,6 +20,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "channel.h"
+#include "socket.h"
#include "migration/migration.h"
#include "qemu-file.h"
#include "io/channel-socket.h"
diff --git a/migration/socket.h b/migration/socket.h
new file mode 100644
index 0000000..6b91e9d
--- /dev/null
+++ b/migration/socket.h
@@ -0,0 +1,28 @@
+/*
+ * QEMU live migration via socket
+ *
+ * Copyright Red Hat, Inc. 2009-2016
+ *
+ * Authors:
+ * Chris Lalancette <clalance@redhat.com>
+ * 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_SOCKET_H
+#define QEMU_MIGRATION_SOCKET_H
+void tcp_start_incoming_migration(const char *host_port, Error **errp);
+
+void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
+ Error **errp);
+
+void unix_start_incoming_migration(const char *path, Error **errp);
+
+void unix_start_outgoing_migration(MigrationState *s, const char *path,
+ Error **errp);
+#endif
--
2.9.4
next prev parent reply other threads:[~2017-06-01 19:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 19:23 [Qemu-devel] [PULL 00/15] Migration PULL request Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 01/15] migration: Use savevm_handlers instead of loadvm copy Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 02/15] migration: loadvm handlers are not used Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 03/15] migration: Remove section_id parameter from vmstate_load Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 04/15] migration: fix leak of src file on dst Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 05/15] migration: shut src return path unconditionally Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 06/15] migration: Remove unneeded includes of migration/vmstate.h Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 07/15] migration: Split qemu-file.h Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 08/15] migration: Export exec.c functions in its own file Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 09/15] migration: Export fd.c " Juan Quintela
2017-06-01 19:23 ` Juan Quintela [this message]
2017-06-01 19:23 ` [Qemu-devel] [PULL 11/15] migration: Export tls.c " Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 12/15] migration: Export rdma.c " Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 13/15] migration: Create include for migration snapshots Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 14/15] migration: Export ram.c functions in its own file Juan Quintela
2017-06-01 19:23 ` [Qemu-devel] [PULL 15/15] migration: Move include/migration/block.h into migration/ Juan Quintela
2017-06-02 14:19 ` [Qemu-devel] [PULL 00/15] Migration PULL request Peter Maydell
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=20170601192327.29712-11-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).