All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Juan Quintela <quintela@redhat.com>
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	[thread overview]
Message-ID: <1455639318-26578-9-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1455639318-26578-1-git-send-email-berrange@redhat.com>

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 <berrange@redhat.com>
---
 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

  parent reply	other threads:[~2016-02-16 16:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-16 16:14 [Qemu-devel] [PATCH v2 00/27] Convert migration to QIOChannel & support TLS Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 01/27] s390: use FILE instead of QEMUFile for creating text file Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 02/27] migration: remove use of qemu_bufopen from vmstate tests Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 03/27] migration: ensure qemu_fflush() always writes full data amount Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 04/27] migration: split migration hooks out of QEMUFileOps Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 05/27] migration: introduce set_blocking function in QEMUFileOps Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 06/27] migration: force QEMUFile to blocking mode for outgoing migration Daniel P. Berrange
2016-02-16 16:14 ` [Qemu-devel] [PATCH v2 07/27] migration: introduce a new QEMUFile impl based on QIOChannel Daniel P. Berrange
2016-02-16 16:14 ` Daniel P. Berrange [this message]
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 09/27] migration: add reporting of errors for outgoing migration Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 10/27] migration: convert post-copy to use QIOChannelBuffer Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 11/27] migration: convert unix socket protocol to use QIOChannel Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 12/27] migration: rename unix.c to socket.c Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 13/27] migration: convert tcp socket protocol to use QIOChannel Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 14/27] migration: convert fd " Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 15/27] migration: convert exec " Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 16/27] migration: convert RDMA to use QIOChannel interface Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 17/27] migration: convert savevm to use QIOChannel for writing to files Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 18/27] migration: delete QEMUFile buffer implementation Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 19/27] migration: delete QEMUSizedBuffer struct Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 20/27] migration: delete QEMUFile sockets implementation Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 21/27] migration: delete QEMUFile stdio implementation Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 22/27] migration: move definition of struct QEMUFile back into qemu-file.c Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 23/27] migration: don't use an array for storing migrate parameters Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 24/27] migration: define 'tls-creds' and 'tls-hostname' migration parameters Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 25/27] migration: add support for encrypting data with TLS Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 26/27] migration: remove support for non-iovec based write handlers Daniel P. Berrange
2016-02-16 16:15 ` [Qemu-devel] [PATCH v2 27/27] migration: remove qemu_get_fd method from QEMUFile Daniel P. Berrange

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=1455639318-26578-9-git-send-email-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.