From patchwork Fri Feb 26 15:10:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8438191 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D35929F2F0 for ; Fri, 26 Feb 2016 15:18:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43877203B4 for ; Fri, 26 Feb 2016 15:18:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D359203B0 for ; Fri, 26 Feb 2016 15:18:45 +0000 (UTC) Received: from localhost ([::1]:50403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKAG-0003pB-QN for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Feb 2016 10:18:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK2c-0008B0-00 for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZK2a-0002jO-6x for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK2Z-0002jH-Tr for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:48 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id A4F97302491 for ; Fri, 26 Feb 2016 15:10:47 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-4-93.ams2.redhat.com [10.36.4.93]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1QFAYDB017253; Fri, 26 Feb 2016 10:10:46 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 26 Feb 2016 15:10:11 +0000 Message-Id: <1456499430-8558-9-git-send-email-berrange@redhat.com> In-Reply-To: <1456499430-8558-1-git-send-email-berrange@redhat.com> References: <1456499430-8558-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , "Dr. David Alan Gilbert" , Juan Quintela Subject: [Qemu-devel] [PATCH v3 08/27] migration: add helpers for creating QEMUFile from a QIOChannel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Dr. David Alan Gilbert --- 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 85b6026..35db68a 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -177,6 +177,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 c173b75..76a4aac 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.