[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/27] migration: add helpers for creating QEMUFi
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 08/27] migration: add helpers for creating QEMUFile from a QIOChannel |
Date: |
Tue, 16 Feb 2016 16:14:59 +0000 |
Currently creating a QEMUFile instance from a QIOChannel is
quite simple only requiring a single call to
qemu_fopen_channel_input or qemu_fopen_channel_output
depending on the end of migration connection.
When QEMU gains TLS support, however, there will need to be
a TLS negotiation done inbetween creation of the QIOChannel
and creation of the final QEMUFile. Introduce some helper
methods that will encapsulate this logic, isolating the
migration protocol drivers from knowledge about TLS.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/migration/migration.h | 6 ++++++
migration/migration.c | 21 +++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 74684ad..63cc4ef 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -176,6 +176,12 @@ void process_incoming_migration(QEMUFile *f);
void qemu_start_incoming_migration(const char *uri, Error **errp);
+void migration_set_incoming_channel(MigrationState *s,
+ QIOChannel *ioc);
+
+void migration_set_outgoing_channel(MigrationState *s,
+ QIOChannel *ioc);
+
uint64_t migrate_max_downtime(void);
void exec_start_incoming_migration(const char *host_port, Error **errp);
diff --git a/migration/migration.c b/migration/migration.c
index cd56000..f3519e5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -419,6 +419,27 @@ void process_incoming_migration(QEMUFile *f)
qemu_coroutine_enter(co, f);
}
+
+void migration_set_incoming_channel(MigrationState *s,
+ QIOChannel *ioc)
+{
+ QEMUFile *f = qemu_fopen_channel_input(ioc);
+
+ process_incoming_migration(f);
+}
+
+
+void migration_set_outgoing_channel(MigrationState *s,
+ QIOChannel *ioc)
+{
+ 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.
--
2.5.0
- [Qemu-devel] [PATCH v2 02/27] migration: remove use of qemu_bufopen from vmstate tests, (continued)
- [Qemu-devel] [PATCH v2 02/27] migration: remove use of qemu_bufopen from vmstate tests, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 01/27] s390: use FILE instead of QEMUFile for creating text file, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 03/27] migration: ensure qemu_fflush() always writes full data amount, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 05/27] migration: introduce set_blocking function in QEMUFileOps, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 04/27] migration: split migration hooks out of QEMUFileOps, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 07/27] migration: introduce a new QEMUFile impl based on QIOChannel, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 06/27] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 10/27] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 11/27] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 13/27] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 08/27] migration: add helpers for creating QEMUFile from a QIOChannel,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 12/27] migration: rename unix.c to socket.c, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 14/27] migration: convert fd socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 16/27] migration: convert RDMA to use QIOChannel interface, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 18/27] migration: delete QEMUFile buffer implementation, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 19/27] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 09/27] migration: add reporting of errors for outgoing migration, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 15/27] migration: convert exec socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 20/27] migration: delete QEMUFile sockets implementation, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 24/27] migration: define 'tls-creds' and 'tls-hostname' migration parameters, Daniel P. Berrange, 2016/02/16
- [Qemu-devel] [PATCH v2 17/27] migration: convert savevm to use QIOChannel for writing to files, Daniel P. Berrange, 2016/02/16