[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 09/28] migration: add helpers for creating QEMUFi
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v4 09/28] migration: add helpers for creating QEMUFile from a QIOChannel |
Date: |
Fri, 11 Mar 2016 16:37:43 +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.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
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 ac2c12c..e335380 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -179,6 +179,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 8fdd630..a4edbe5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -428,6 +428,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 v4 01/28] s390: use FILE instead of QEMUFile for creating text file, (continued)
- [Qemu-devel] [PATCH v4 01/28] s390: use FILE instead of QEMUFile for creating text file, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 04/28] migration: ensure qemu_fflush() always writes full data amount, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 02/28] io: avoid double-free when closing QIOChannelBuffer, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 03/28] migration: remove use of qemu_bufopen from vmstate tests, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 06/28] migration: introduce set_blocking function in QEMUFileOps, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 05/28] migration: split migration hooks out of QEMUFileOps, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 08/28] migration: introduce a new QEMUFile impl based on QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 07/28] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 10/28] migration: add reporting of errors for outgoing migration, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 11/28] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 09/28] migration: add helpers for creating QEMUFile from a QIOChannel,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v4 12/28] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 13/28] migration: rename unix.c to socket.c, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 14/28] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 18/28] migration: convert savevm to use QIOChannel for writing to files, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 16/28] migration: convert exec socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 15/28] migration: convert fd socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 19/28] migration: delete QEMUFile buffer implementation, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 22/28] migration: delete QEMUFile stdio implementation, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 24/28] migration: don't use an array for storing migrate parameters, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 20/28] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/03/11