From patchwork Thu Jul 21 05:05:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9240951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4385C607D3 for ; Thu, 21 Jul 2016 05:07:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38EE827BF7 for ; Thu, 21 Jul 2016 05:07:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D77127CF9; Thu, 21 Jul 2016 05:07:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id C027927BF7 for ; Thu, 21 Jul 2016 05:07:40 +0000 (UTC) Received: from localhost ([::1]:38273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ6Cx-0004Fh-Py for patchwork-qemu-devel@patchwork.kernel.org; Thu, 21 Jul 2016 01:07:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ6CX-0004Eh-1i for qemu-devel@nongnu.org; Thu, 21 Jul 2016 01:07:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ6CT-00016A-RI for qemu-devel@nongnu.org; Thu, 21 Jul 2016 01:07:12 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:14528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ6CT-00013H-1P for qemu-devel@nongnu.org; Thu, 21 Jul 2016 01:07:09 -0400 Received: from 172.24.1.136 (EHLO szxeml433-hub.china.huawei.com) ([172.24.1.136]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DOB93231; Thu, 21 Jul 2016 13:06:47 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.235.1; Thu, 21 Jul 2016 13:06:34 +0800 From: zhanghailiang To: Date: Thu, 21 Jul 2016 13:05:59 +0800 Message-ID: <1469077560-20620-2-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1469077560-20620-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1469077560-20620-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.57905869.0002, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: a619a95897e0eb0e489d89c2de6ca4e5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Subject: [Qemu-devel] [RFC PATCH 1/2] migration: Allow the migrate command to work on file:urls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Benoit Canet , zhanghailiang , quintela@redhat.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, amit.shah@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Usage: (qemu) migrate file:/path/to/vm_statefile Signed-off-by: zhanghailiang Signed-off-by: Benoit Canet Reviewed-by: Dr. David Alan Gilbert --- include/migration/migration.h | 2 ++ migration/fd.c | 34 ++++++++++++++++++++++++++++------ migration/migration.c | 2 ++ migration/trace-events | 1 + 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 3c96623..cc2e4f6 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -221,6 +221,8 @@ void fd_start_incoming_migration(const char *path, Error **errp); void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp); +void file_start_outgoing_migration(MigrationState *s, const char *filename, Error **errp); + void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp); void rdma_start_incoming_migration(const char *host_port, Error **errp); diff --git a/migration/fd.c b/migration/fd.c index 84a10fd..fa5df67 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -23,15 +23,11 @@ #include "trace.h" -void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp) +static void fd_start_outgoing_migration_core(MigrationState *s, int fd, + Error **errp) { QIOChannel *ioc; - int fd = monitor_get_fd(cur_mon, fdname, errp); - if (fd == -1) { - return; - } - trace_migration_fd_outgoing(fd); ioc = qio_channel_new_fd(fd, errp); if (!ioc) { close(fd); @@ -42,6 +38,32 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** object_unref(OBJECT(ioc)); } +void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp) +{ + int fd = monitor_get_fd(cur_mon, fdname, errp); + if (fd == -1) { + return; + } + + trace_migration_fd_outgoing(fd); + fd_start_outgoing_migration_core(s, fd, errp); +} + +void file_start_outgoing_migration(MigrationState *s, const char *filename, + Error **errp) +{ + int fd; + + fd = qemu_open(filename, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR); + if (fd < 0) { + error_setg_errno(errp, errno, "Failed to open file: %s", filename); + return; + } + + trace_migration_file_outgoing(filename); + fd_start_outgoing_migration_core(s, fd, errp); +} + static gboolean fd_accept_incoming_migration(QIOChannel *ioc, GIOCondition condition, gpointer opaque) diff --git a/migration/migration.c b/migration/migration.c index c4e0193..097adba 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1109,6 +1109,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, unix_start_outgoing_migration(s, p, &local_err); } else if (strstart(uri, "fd:", &p)) { fd_start_outgoing_migration(s, p, &local_err); + } else if (strstart(uri, "file:", &p)) { + file_start_outgoing_migration(s, p, &local_err); } else { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri", "a valid migration protocol"); diff --git a/migration/trace-events b/migration/trace-events index 8568dab..4fca64c 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -194,6 +194,7 @@ migration_exec_incoming(const char *cmd) "cmd=%s" # migration/fd.c migration_fd_outgoing(int fd) "fd=%d" migration_fd_incoming(int fd) "fd=%d" +migration_file_outgoing(const char *filename) "file=%s" # migration/socket.c migration_socket_incoming_accepted(void) ""