[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/28] migration: add helpers for creating QEMUFile f
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PULL 09/28] migration: add helpers for creating QEMUFile from a QIOChannel |
Date: |
Thu, 26 May 2016 11:42:00 +0530 |
From: "Daniel P. Berrange" <address@hidden>
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>
Acked-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <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 9e36a97..87ad577 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 c8d10ee..c960e16 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.5
- [Qemu-devel] [PULL 01/28] s390: use FILE instead of QEMUFile for creating text file, (continued)
- [Qemu-devel] [PULL 01/28] s390: use FILE instead of QEMUFile for creating text file, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 03/28] migration: remove use of qemu_bufopen from vmstate tests, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 02/28] io: avoid double-free when closing QIOChannelBuffer, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 04/28] migration: ensure qemu_fflush() always writes full data amount, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 07/28] migration: force QEMUFile to blocking mode for outgoing migration, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 05/28] migration: split migration hooks out of QEMUFileOps, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 06/28] migration: introduce set_blocking function in QEMUFileOps, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 11/28] migration: convert post-copy to use QIOChannelBuffer, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 08/28] migration: introduce a new QEMUFile impl based on QIOChannel, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 12/28] migration: convert unix socket protocol to use QIOChannel, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 09/28] migration: add helpers for creating QEMUFile from a QIOChannel,
Amit Shah <=
- [Qemu-devel] [PULL 10/28] migration: add reporting of errors for outgoing migration, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 13/28] migration: rename unix.c to socket.c, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 15/28] migration: convert fd socket protocol to use QIOChannel, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 14/28] migration: convert tcp socket protocol to use QIOChannel, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 16/28] migration: convert exec socket protocol to use QIOChannel, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 17/28] migration: convert RDMA to use QIOChannel interface, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 18/28] migration: convert savevm to use QIOChannel for writing to files, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 20/28] migration: delete QEMUSizedBuffer struct, Amit Shah, 2016/05/26